From 6a1079ac4287d95ec310dc5533a2aa286cae162d Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Tue, 28 Jan 2020 21:05:26 +0100 Subject: [PATCH] Clean up --- .../templates/deployment-backend.yaml | 11 ++++------- .../templates/letsencrypt-staging.yaml | 2 +- deployment/helm/human-connection/values.yaml | 2 -- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/deployment/helm/human-connection/templates/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployment-backend.yaml index 2febeab84..e30e66431 100644 --- a/deployment/helm/human-connection/templates/deployment-backend.yaml +++ b/deployment/helm/human-connection/templates/deployment-backend.yaml @@ -24,14 +24,14 @@ spec: human-connection.org/selector: deployment-backend spec: containers: - - envFrom: + - name: backend + image: humanconnection/nitro-backend:latest + imagePullPolicy: {{ .Values.pullPolicy }} + envFrom: - configMapRef: name: {{ .Release.Name }}-configmap - secretRef: name: {{ .Release.Name }}-secrets - image: humanconnection/nitro-backend:latest - imagePullPolicy: {{ .Values.pullPolicy }} - name: backend ports: - containerPort: 4000 protocol: TCP @@ -50,7 +50,4 @@ spec: - name: uploads persistentVolumeClaim: claimName: uploads-claim - dnsPolicy: ClusterFirst - restartPolicy: Always - terminationGracePeriodSeconds: 30 status: {} diff --git a/deployment/helm/human-connection/templates/letsencrypt-staging.yaml b/deployment/helm/human-connection/templates/letsencrypt-staging.yaml index 27889f5db..f8315c9be 100644 --- a/deployment/helm/human-connection/templates/letsencrypt-staging.yaml +++ b/deployment/helm/human-connection/templates/letsencrypt-staging.yaml @@ -11,4 +11,4 @@ spec: solvers: - http01: ingress: - class: nginx \ No newline at end of file + class: nginx diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml index 044341e0c..8efcd0c06 100644 --- a/deployment/helm/human-connection/values.yaml +++ b/deployment/helm/human-connection/values.yaml @@ -11,8 +11,6 @@ smtpHost: "mailserver.human-connection" smtpPort: "25" smtpUsername: smtpPassword: -sentryDsnWebapp: "https://f6a31aa8f406426187cb45ae6dacdbeb@nitro-sentry.human-connection.org/7" -sentryDsnBackend: "https://44e0f3fb04894fbfbcf898f2bcf652de@nitro-sentry.human-connection.org/6" neo4jResourceRequestsMemory: "1G" neo4jResourceLimitsMemory: "2G" neo4jConfig: