From 04e1e4d01439825ce7cdf5700b5f9e9f18446ae3 Mon Sep 17 00:00:00 2001 From: Edward Wilde Date: Mon, 17 Jun 2019 22:14:12 +0100 Subject: [PATCH] Add licence support Signed-off-by: Edward Wilde --- .../templates/faaslambda-dep.yaml | 19 +++++++++++++++++++ deployment/chart/of-federation/values.yaml | 2 ++ 2 files changed, 21 insertions(+) diff --git a/deployment/chart/of-federation/templates/faaslambda-dep.yaml b/deployment/chart/of-federation/templates/faaslambda-dep.yaml index c41e4b7..a1cbfc0 100644 --- a/deployment/chart/of-federation/templates/faaslambda-dep.yaml +++ b/deployment/chart/of-federation/templates/faaslambda-dep.yaml @@ -19,6 +19,11 @@ spec: spec: serviceAccountName: {{ .Release.Name }}-controller volumes: + {{- if .Values.basic_auth }} + - name: auth + secret: + secretName: basic-auth + {{- end }} - name: lambda-aws-access secret: secretName: lambda-aws-access @@ -41,6 +46,10 @@ spec: value: "{{ .Values.faaslambda.httpProbe }}" - name: secret_mount_path value: "/var/secrets" + {{- if .Values.basic_auth }} + - name: basic_auth + value: "{{ .Values.basic_auth }}" + {{- end }} - name: readiness_probe_initial_delay_seconds value: "{{ .Values.faaslambda.readinessProbe.initialDelaySeconds }}" - name: readiness_probe_timeout_seconds @@ -55,6 +64,10 @@ spec: value: "{{ .Values.faaslambda.livenessProbe.periodSeconds }}" - name: lambda_execution_role value: "{{ .Values.faaslambda.lambda_execution_role }}" + - name: licence_jwt + value: "{{ .Values.faaslambda.licence_jwt }}" + - name: licence_email + value: "{{ .Values.faaslambda.licence_email }}" - name: AWS_REGION value: "{{ .Values.faaslambda.aws_region }}" - name: AWS_ACCESS_KEY_ID @@ -67,6 +80,12 @@ spec: secretKeyRef: name: lambda-aws-access key: AWS_SECRET_ACCESS_KEY + {{- if .Values.basic_auth }} + volumeMounts: + - name: auth + readOnly: true + mountPath: "/var/secrets" + {{- end }} ports: - containerPort: 8080 protocol: TCP diff --git a/deployment/chart/of-federation/values.yaml b/deployment/chart/of-federation/values.yaml index 1937603..e340a5b 100644 --- a/deployment/chart/of-federation/values.yaml +++ b/deployment/chart/of-federation/values.yaml @@ -59,6 +59,8 @@ faaslambda: timeoutSeconds: 1 periodSeconds: 10 lambda_execution_role: "" + licence_jwt: "" + licence_email: "" aws_region: "eu-west-1" gateway: