Update env variables in helm deployment.

Author: spencercrose

helm/templates/_helpers.tpl

@@ -1,5 +1,5 @@
 
-{{- define "ssoGateway.name" -}}
+{{- define "kilnAPI.name" -}}
 {{- default .Chart.Name .Values.global.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -9,7 +9,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "ssoGateway.fullname" -}}
+{{- define "kilnAPI.fullname" -}}
 {{- $name := default .Chart.Name .Values.global.nameOverride }}
 {{- if contains $name .Release.Name }}
 {{- .Release.Name | trunc 63 | trimSuffix "-" }}
@@ -21,16 +21,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "ssoGateway.chart" -}}
+{{- define "kilnAPI.chart" -}}
 {{- printf "%s-%s" .Chart.Name $.Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "ssoGateway.labels" -}}
-helm.sh/chart: {{ include "ssoGateway.chart" . }}
-{{ include "ssoGateway.selectorLabels" . }}
+{{- define "kilnAPI.labels" -}}
+helm.sh/chart: {{ include "kilnAPI.chart" . }}
+{{ include "kilnAPI.selectorLabels" . }}
 {{- if $.Chart.AppVersion }}
 app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }}
 {{- end }}
@@ -40,7 +40,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "ssoGateway.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "ssoGateway.name" . }}
+{{- define "kilnAPI.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kilnAPI.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}

helm/templates/deployment.yaml

@@ -1,17 +1,17 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "ssoGateway.fullname" . }}-client
+  name: {{ include "kilnAPI.fullname" . }}-client
   labels:
-    {{- include "ssoGateway.labels" . | nindent 4 }}
+    {{- include "kilnAPI.labels" . | nindent 4 }}
 spec:
   {{- if not .Values.kilnAPI.autoscaling.enabled }}
   replicas: {{ .Values.kilnAPI.replicaCount }}
   {{- end }}
   revisionHistoryLimit: 1
   selector:
     matchLabels:
-      {{- include "ssoGateway.selectorLabels" . | nindent 6 }}
+      {{- include "kilnAPI.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       # annotations:
@@ -45,7 +45,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "ssoGateway.labels" . | nindent 8 }}
+        {{- include "kilnAPI.labels" . | nindent 8 }}
         {{- with .Values.kilnAPI.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -116,13 +116,17 @@ spec:
             - name: SSO_CLIENT_PORT
               value: {{  .Values.kilnAPI.service.port | quote }}
             - name: NGINX_PROXY_URL
-              value: http://{{ include "ssoGateway.fullname" . }}-nginx-svc
+              value: http://{{ include "kilnAPI.fullname" . }}-nginx-svc
             - name: REDIS_STORE_URL
-              value: redis://{{ include "ssoGateway.fullname" . }}-redis-svc:{{ .Values.redis.service.port }}
+              value: redis://{{ include "kilnAPI.fullname" . }}-redis-svc:{{ .Values.redis.service.port }}
             - name: REDIRECT_URL
-              value: http://{{ include "ssoGateway.fullname" . }}-client-svc:{{ .Values.kilnAPI.service.port }}/authn/callback
+              value: http://{{ include "kilnAPI.fullname" . }}-client-svc:{{ .Values.kilnAPI.service.port }}/authn/callback
             - name: VAULT_CONFIG_PATH
               value: {{  .Values.global.vault.containerPath | quote }}
+            - name: SESSION_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.kilnAPI.session.secretName }}
           envFrom:
             {{- toYaml .Values.kilnAPI.envFrom | nindent 12 }}
           {{- with .Values.kilnAPI.volumeMounts }}

helm/templates/service.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "ssoGateway.fullname" . }}-client-svc
+  name: {{ include "kilnAPI.fullname" . }}-client-svc
   labels:
-    {{- include "ssoGateway.labels" . | nindent 4 }}
+    {{- include "kilnAPI.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.kilnAPI.service.type | default "ClusterIP" }}
   ports:
@@ -12,4 +12,4 @@ spec:
       targetPort: {{ .Values.kilnAPI.service.port }}
       protocol: TCP
   selector:
-    {{- include "ssoGateway.selectorLabels" . | nindent 4 }}
+    {{- include "kilnAPI.selectorLabels" . | nindent 4 }}

helm/values.yaml

@@ -58,8 +58,21 @@ kilnAPI:
     capabilities:
       drop:
         - ALL
-
-  env: {}
+  env:
+    - name: APP_ID
+      value: "kiln-api-test"
+    - name: PORT
+      value: "3000"
+    - name: LOG_LEVEL
+      value: "debug"
+    - name: REQUEST_LIMIT
+      value: "100kb"
+    - name: SWAGGER_API_SPEC
+      value: "/api/spec"
+
+  session:
+    # Secret name for session secret
+    secretName: "kiln-api-secrets"
 
   service:
     type: ClusterIP