fix(dispatch) fix the sceduler command and add the db init command to the web container

charts/conduit/index.yaml

@@ -0,0 +1,3 @@
+apiVersion: v1
+entries: {}
+generated: "2023-12-16T11:30:08.388054+01:00"

charts/dispatch/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v2
 name: dispatch
 description: Netflix Dispatch incident management system
-version: 0.1.0
+version: 0.1.2

charts/dispatch/templates/configmap.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "dispatch.fullname" . }}-config
-  labels:
-    {{- include "dispatch.labels" . | nindent 4 }}
 data:
-  {{- toYaml .Values.configMap.general | nindent 2 }}
+  POSTGRES_HOSTNAME: {{ .Values.postgres.hostname | quote }}
+  POSTGRES_DATABASE_NAME: {{ .Values.postgres.database_name | quote }}
+  POSTGRES_PORT: {{ .Values.postgres.port | quote }}

charts/dispatch/templates/web-deployment.yaml

@@ -14,6 +14,10 @@ spec:
       labels:
         app: {{ include "dispatch.fullname" . }}-web
     spec:
+      initContainers:
+        - name: web-db-init
+          image: "{{ .Values.web.image.repository }}:{{ .Values.web.image.tag }}"
+          command: ["web", "database", "init"]
       containers:
         - name: web
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -21,10 +25,6 @@ spec:
           command: {{ .Values.web.command }}
           ports:
             - containerPort: {{ .Values.web.container.port }}
-          service:
-            type: ClusterIP
-            port: 80
-            targetPort: 8000
           envFrom:
             - configMapRef:
                 name: {{ include "dispatch.fullname" . }}-config

charts/dispatch/values.yaml

@@ -25,15 +25,11 @@ web:
     port: 80
 
 scheduler:
-  command: ["scheduler", "start"]
+  command: ["dispatch", "scheduler", "start"]
-
-configMap:
-  general:
-    COMPOSE_PROJECT_NAME: "dispatch"
-    DATABASE_HOSTNAME: "postgres-rw.databases.svc.cluster.local"
-    DATABASE_NAME: "dispatch"
-    DATABASE_PORT: "5432"
 
 postgres:
+  hostname: "postgres-rw.databases.svc.cluster.local"
+  database_name: "postgres"
+  port: "5432"
   secretRef:
     name: dispatch-secret

charts/index.yaml

@@ -1,3 +1,3 @@
 apiVersion: v1
 entries: {}
-generated: "2023-10-26T06:39:11.079729+02:00"
+generated: "2023-12-16T11:31:03.238235+01:00"