diff --git a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml index 61e0b22a2..33aa8a0e0 100644 --- a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml +++ b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml @@ -30,8 +30,8 @@ spec: spec: containers: - name: backend - image: humanconnection/nitro-backend:latest - imagePullPolicy: {{ .Values.pullPolicy }} + image: "{{ .Values.backendImage }}:{{ .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} envFrom: - configMapRef: name: {{ .Release.Name }}-configmap diff --git a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml index 11491163f..85c587197 100644 --- a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml +++ b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml @@ -25,7 +25,7 @@ spec: containers: - name: mailserver image: djfarrelly/maildev - imagePullPolicy: {{ .Values.pullPolicy }} + imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: 80 - containerPort: 25 diff --git a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml index 86b3fbd4e..b12069f7e 100644 --- a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml +++ b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml @@ -24,7 +24,7 @@ spec: env: - name: HOST value: 0.0.0.0 - image: humanconnection/maintenance:latest + image: "{{ .Values.maintenanceImage }}:{{ .Chart.AppVersion }}" ports: - containerPort: 80 imagePullPolicy: Always diff --git a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml index 04b58953a..ae244fdce 100644 --- a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml +++ b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml @@ -28,8 +28,8 @@ spec: spec: containers: - name: neo4j - image: humanconnection/neo4j:0.2.2 - imagePullPolicy: {{ .Values.pullPolicy }} + image: "{{ .Values.neo4jImage }}:{{ .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: 7687 - containerPort: 7474 diff --git a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml index 30f3ffd16..c0a62560f 100644 --- a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml +++ b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml @@ -25,7 +25,7 @@ spec: containers: - name: webapp image: humanconnection/nitro-web:0.2.2 - imagePullPolicy: {{ .Values.pullPolicy }} + imagePullPolicy: {{ .Values.image.pullPolicy }} envFrom: - configMapRef: name: {{ .Release.Name }}-configmap diff --git a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml index 675bcf344..81fd92e13 100644 --- a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml +++ b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml @@ -20,7 +20,7 @@ spec: restartPolicy: Never containers: - name: db-migrations-job - image: humanconnection/nitro-backend:latest + image: "{{ .Values.backendImage }}:{{ .Chart.AppVersion }}" command: ["/bin/sh", "-c", "{{ .Values.dbMigrations }}"] envFrom: - configMapRef: diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml index ed14aee79..1858fca55 100644 --- a/deployment/helm/human-connection/values.yaml +++ b/deployment/helm/human-connection/values.yaml @@ -6,8 +6,18 @@ commit: 889a7cdd24dda04a139b2b77d626e984d6db6781 dbInitializion: "yarn prod:migrate init" # dbMigrations runs the database migrations in a post-upgrade hook. dbMigrations: "yarn prod:migrate up" -# pullPolicy indicates when, if ever, pods pull a new image from docker hub. -pullPolicy: Always +# bakendImage is the docker image for the backend deployment +backendImage: humanconnection/nitro-backend +# maintenanceImage is the docker image for the maintenance deployment +maintenanceImage: humanconnection/maintenance +# neo4jImage is the docker image for the neo4j deployment +neo4jImage: humanconnection/neo4j +# webappImage is the docker image for the webapp deployment +webappImage: humanconnection/nitro-web +# image configures pullPolicy related to the docker images +image: + # pullPolicy indicates when, if ever, pods pull a new image from docker hub. + pullPolicy: IfNotPresent # letsencryptIssuer is used by cert-manager to set up certificates with the given provider. letsencryptIssuer: "letsencrypt-prod" # neo4jConfig changes any default neo4j config/adds it.