Merge pull request #9 from OpSecId/pstlouis/helm-deployment

Fix deployment charts
bcgov · Apr 5, 2024 · 68db16f · 68db16f
2 parents 76d0633 + f54a30d
commit 68db16f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/charts/README.md b/charts/README.md
@@ -4,16 +4,16 @@ Copy the following to an `.env` file and fill in the values
 ```bash
 # the did namespace did:web:{domain}:{did_namespace}:{identifier}
 # ex: organizations, instances, identifiers, clients, tenants
-DID_NAMESPACE: 'organizations'
+DID_NAMESPACE='organizations'
 
 # Created api key from a traction tenant account
-TRACTION_API_KEY: ''
+TRACTION_API_KEY=''
 
 # Created tenant_id from a traction tenant account
-TRACTION_TENANT_ID: ''
+TRACTION_TENANT_ID=''
 
 # url for the traction api endpoint
-TRACTION_API_ENDPOINT: ''
+TRACTION_API_ENDPOINT=''
 ```
 
 To test the charts

diff --git a/charts/traction-tenant-traceability-controller/templates/controller/deployment.yaml b/charts/traction-tenant-traceability-controller/templates/controller/deployment.yaml
@@ -26,9 +26,6 @@ spec:
             {{- toYaml .Values.controller.containerSecurityContext | nindent 12 }}
           image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"
           imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
-          env:
-            - name: WORKERS
-              value: '4'
           envFrom:
             - secretRef:
                 name: {{ include "controller.fullname" . }}-env
@@ -40,10 +37,14 @@ spec:
             httpGet:
               path: /status/live
               port: {{ .Values.controller.service.apiPort }}
+            failureThreshold: 2
+            initialDelaySeconds: 5
+            periodSeconds: 5
           readinessProbe:
             httpGet:
               path: /status/ready
               port: {{ .Values.controller.service.apiPort }}
+            initialDelaySeconds: 5
           resources:
             {{- toYaml .Values.controller.resources | nindent 12 }}
       nodeSelector:

diff --git a/charts/traction-tenant-traceability-controller/templates/controller/route.yaml b/charts/traction-tenant-traceability-controller/templates/controller/route.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{- include "controller.labels" . | nindent 4 }}
 spec:
-  host: {{ .host | quote }}
+  host: {{ .Values.controller.host | quote }}
   path: {{ .Values.openshift.route.path }}
   to:
     kind: Service

diff --git a/charts/traction-tenant-traceability-controller/values.yaml b/charts/traction-tenant-traceability-controller/values.yaml
@@ -101,7 +101,7 @@ acapy:
 
 postgresql:
   enabled: true
-  fullnameOverride: "postgresql"
+  fullnameOverride: "tttc-postgresql"
   architecture: standalone
   auth:
     enablePostgresUser: true