diff --git a/charts/conduit/index.yaml b/charts/conduit/index.yaml new file mode 100644 index 0000000..6ca713f --- /dev/null +++ b/charts/conduit/index.yaml @@ -0,0 +1,3 @@ +apiVersion: v1 +entries: {} +generated: "2023-12-16T11:30:08.388054+01:00" diff --git a/charts/dispatch/Chart.yaml b/charts/dispatch/Chart.yaml index c9b73de..54e6adb 100644 --- a/charts/dispatch/Chart.yaml +++ b/charts/dispatch/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: dispatch description: Netflix Dispatch incident management system -version: 0.1.0 \ No newline at end of file +version: 0.1.2 \ No newline at end of file diff --git a/charts/dispatch/templates/configmap.yaml b/charts/dispatch/templates/configmap.yaml index e915f0f..a3b9584 100644 --- a/charts/dispatch/templates/configmap.yaml +++ b/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 }} \ No newline at end of file + POSTGRES_HOSTNAME: {{ .Values.postgres.hostname | quote }} + POSTGRES_DATABASE_NAME: {{ .Values.postgres.database_name | quote }} + POSTGRES_PORT: {{ .Values.postgres.port | quote }} \ No newline at end of file diff --git a/charts/dispatch/templates/web-deployment.yaml b/charts/dispatch/templates/web-deployment.yaml index e04dba1..6c19d86 100644 --- a/charts/dispatch/templates/web-deployment.yaml +++ b/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 diff --git a/charts/dispatch/values.yaml b/charts/dispatch/values.yaml index 124c22f..72cd6b3 100644 --- a/charts/dispatch/values.yaml +++ b/charts/dispatch/values.yaml @@ -25,15 +25,11 @@ web: port: 80 scheduler: - command: ["scheduler", "start"] - -configMap: - general: - COMPOSE_PROJECT_NAME: "dispatch" - DATABASE_HOSTNAME: "postgres-rw.databases.svc.cluster.local" - DATABASE_NAME: "dispatch" - DATABASE_PORT: "5432" + command: ["dispatch", "scheduler", "start"] postgres: + hostname: "postgres-rw.databases.svc.cluster.local" + database_name: "postgres" + port: "5432" secretRef: name: dispatch-secret \ No newline at end of file diff --git a/charts/index.yaml b/charts/index.yaml index cbc565c..fb74f76 100644 --- a/charts/index.yaml +++ b/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"