add configmap

chart/princeton-manifold/templates/_helpers.tpl

@@ -60,3 +60,19 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create default fully qualified service names.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "princeton-manifold.redis.fullname" -}}
+{{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "princeton-manifold.redis.host" -}}
+{{- printf "%s-master" (include "princeton-manifold.redis.fullname" .) -}}
+{{- end -}}
+
+{{- define "princeton-manifold.redis.url" -}}
+{{- printf "redis://:%s@%s:%s" .Values.redis.auth.password (include "princeton-manifold.redis.host" .) "6379/0" -}}
+{{- end -}}

chart/princeton-manifold/templates/deployment.yaml

@@ -17,6 +17,7 @@ spec:
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+        checksum/princeton-manifold-production-env: {{ include (print $.Template.BasePath "/configmap-env.yaml") . | sha256sum }}
       labels:
         {{- include "princeton-manifold.labels" . | nindent 8 }}
         {{- with .Values.podLabels }}
@@ -36,6 +37,9 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          envFrom:
+            - configMapRef:
+                name: {{ include "princeton-manifold.fullname" . }}-env
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}

chart/princeton-manifold/values.yaml

@@ -105,3 +105,12 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+env:
+  rails_secret_key: $RAILS_SECRET_KEY
+
+externalPostgresql:
+  host: acid-postgres-cluster-delta.postgres.svc.cluster.local
+  username: princeton-manifold
+  password: $DB_PASSWORD
+  database: princeton_manifold_production