Skip to content

[IMP] Simplify environment variable injection in Helm charts using envFrom #944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ascalotoru wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

[IMP] Simplify environment variable injection in Helm charts using envFrom #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/kubernetes/charts/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.1
version: 0.2.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
82 changes: 38 additions & 44 deletions deploy/kubernetes/charts/templates/iris_app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,65 +45,59 @@ spec:
imagePullPolicy: "{{ .Values.irisapp.imagePullPolicy }}"
command: ['nohup', './iris-entrypoint.sh', 'iriswebapp']

env:
{{- range $key := list "POSTGRES_USER" "POSTGRES_PASSWORD" "POSTGRES_ADMIN_USER" "POSTGRES_ADMIN_PASSWORD" "POSTGRES_PORT" "POSTGRES_SERVER" }}
- name: {{ $key }}
{{- if and (hasKey $.Values.irisapp "envFromSecret") (has $key $.Values.irisapp.envFromSecret.keys) }}
valueFrom:
secretKeyRef:
name: {{ $.Values.irisapp.envFromSecret.name }}
key: {{ $key }}
{{- else }}
value: {{ index $.Values.irisapp $key | quote }}
{{- end }}
envFrom:
{{- range $.Values.irisapp.envFromSecrets }}
- secretRef:
name: {{ .name }}
{{- end }}

- name: IRIS_SECRET_KEY
value: {{ .Values.irisapp.IRIS_SECRET_KEY | quote }}
env:
- name: IRIS_SECRET_KEY
value: {{ .Values.irisapp.IRIS_SECRET_KEY | quote }}

- name: IRIS_SECURITY_PASSWORD_SALT
value: {{ .Values.irisapp.IRIS_SECURITY_PASSWORD_SALT | quote }}
- name: IRIS_SECURITY_PASSWORD_SALT
value: {{ .Values.irisapp.IRIS_SECURITY_PASSWORD_SALT | quote }}

- name: DB_RETRY_COUNT
value: {{ .Values.irisapp.DB_RETRY_COUNT | quote }}
- name: DB_RETRY_COUNT
value: {{ .Values.irisapp.DB_RETRY_COUNT | quote }}

- name: DB_RETRY_DELAY
value: {{ .Values.irisapp.DB_RETRY_DELAY | quote }}
- name: DB_RETRY_DELAY
value: {{ .Values.irisapp.DB_RETRY_DELAY | quote }}

- name: INTERFACE_HTTPS_PORT
value: {{ .Values.irisapp.INTERFACE_HTTPS_PORT | quote }}
- name: INTERFACE_HTTPS_PORT
value: {{ .Values.irisapp.INTERFACE_HTTPS_PORT | quote }}

- name: IRIS_ADM_USERNAME
value: {{ .Values.irisapp.IRIS_ADM_USERNAME | quote }}
- name: IRIS_ADM_USERNAME
value: {{ .Values.irisapp.IRIS_ADM_USERNAME | quote }}

- name: IRIS_ADM_PASSWORD
value: {{ .Values.irisapp.IRIS_ADM_PASSWORD | quote }}

{{- if eq .Values.irisapp.IRIS_AUTHENTICATION_TYPE "oidc" }}
- name: OIDC_ISSUER_URL
value: {{ .Values.irisapp.OIDC_ISSUER_URL | quote }}
- name: IRIS_ADM_PASSWORD
value: {{ .Values.irisapp.IRIS_ADM_PASSWORD | quote }}

- name: OIDC_CLIENT_ID
value: {{ .Values.irisapp.OIDC_CLIENT_ID | quote }}
{{- if eq .Values.irisapp.IRIS_AUTHENTICATION_TYPE "oidc" }}
- name: OIDC_ISSUER_URL
value: {{ .Values.irisapp.OIDC_ISSUER_URL | quote }}

- name: OIDC_CLIENT_SECRET
value: {{ .Values.irisapp.OIDC_CLIENT_SECRET | quote }}
- name: OIDC_CLIENT_ID
value: {{ .Values.irisapp.OIDC_CLIENT_ID | quote }}

- name: OIDC_AUTH_ENDPOINT
value: {{ .Values.irisapp.OIDC_AUTH_ENDPOINT | quote }}
- name: OIDC_CLIENT_SECRET
value: {{ .Values.irisapp.OIDC_CLIENT_SECRET | quote }}

- name: OIDC_TOKEN_ENDPOINT
value: {{ .Values.irisapp.OIDC_TOKEN_ENDPOINT | quote }}
- name: OIDC_AUTH_ENDPOINT
value: {{ .Values.irisapp.OIDC_AUTH_ENDPOINT | quote }}

- name: OIDC_END_SESSION_ENDPOINT
value: {{ .Values.irisapp.OIDC_END_SESSION_ENDPOINT | quote }}
- name: OIDC_TOKEN_ENDPOINT
value: {{ .Values.irisapp.OIDC_TOKEN_ENDPOINT | quote }}

- name: OIDC_MAPPING_USERGROUP
value: {{ .Values.irisapp.OIDC_MAPPING_USERGROUP | quote }}
- name: OIDC_END_SESSION_ENDPOINT
value: {{ .Values.irisapp.OIDC_END_SESSION_ENDPOINT | quote }}

- name: OIDC_MAPPING_ROLES
value: {{ .Values.irisapp.OIDC_MAPPING_ROLES | quote }}
{{- end }}
- name: OIDC_MAPPING_USERGROUP
value: {{ .Values.irisapp.OIDC_MAPPING_USERGROUP | quote }}

- name: OIDC_MAPPING_ROLES
value: {{ .Values.irisapp.OIDC_MAPPING_ROLES | quote }}
{{- end }}

ports:
- containerPort: 8000
Expand Down
17 changes: 6 additions & 11 deletions deploy/kubernetes/charts/templates/iris_worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,18 @@ spec:
image: "{{ .Values.irisworker.image}}:{{ .Values.irisworker.tag }}"
imagePullPolicy: "{{ .Values.irisworker.imagePullPolicy }}"
command: ['./wait-for-iriswebapp.sh', "{{ .Values.irisapp.name }}:{{ .Values.irisapp.service.port }}", './iris-entrypoint.sh', 'iris-worker']

envFrom:
{{- range $.Values.irisworker.envFromSecrets }}
- secretRef:
name: {{ .name }}
{{- end }}

env:

- name: DOCKERIZED
value: {{ .Values.irisworker.DOCKERIZED | quote }}

{{- range $key := list "POSTGRES_USER" "POSTGRES_PASSWORD" "POSTGRES_ADMIN_USER" "POSTGRES_ADMIN_PASSWORD" "POSTGRES_PORT" "POSTGRES_SERVER" }}
- name: {{ $key }}
{{- if and (hasKey $.Values.irisworker "envFromSecret") (has $key $.Values.irisworker.envFromSecret.keys) }}
valueFrom:
secretKeyRef:
name: {{ $.Values.irisworker.envFromSecret.name }}
key: {{ $key }}
{{- else }}
value: {{ index $.Values.irisworker $key | quote }}
{{- end }}
{{- end }}

- name: CELERY_BROKER
value: {{ .Values.irisworker.CELERY_BROKER | quote }}
Expand Down
32 changes: 10 additions & 22 deletions deploy/kubernetes/charts/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,11 @@ irisapp:
DB_RETRY_DELAY: 5
INTERFACE_HTTPS_PORT: 443

## @param irisapp.envFromSecret Environment variables from a secret
##
envFromSecret:
name: postgres-secret
keys:
- POSTGRES_USER
- POSTGRES_PASSWORD
- POSTGRES_ADMIN_USER
- POSTGRES_ADMIN_PASSWORD
- POSTGRES_PORT
- POSTGRES_SERVER
## @param irisapp.envFromSecrets List of secrets to load environment variables from
##
envFromSecrets:
- name: postgres-secret
# - name: extra-secret

## @param irisapp.securityContext securityContext for irisapp
##
Expand Down Expand Up @@ -199,17 +193,11 @@ irisworker:
IRIS_SECRET_KEY: AVerySuperSecretKey-SoNotThisOne
IRIS_SECURITY_PASSWORD_SALT: ARandomSalt-NotThisOneEither

## @param irisapp.envFromSecret Environment variables from a secret
##
envFromSecret:
name: postgres-secret
keys:
- POSTGRES_USER
- POSTGRES_PASSWORD
- POSTGRES_ADMIN_USER
- POSTGRES_ADMIN_PASSWORD
- POSTGRES_PORT
- POSTGRES_SERVER
## @param irisworker.envFromSecrets List of secrets to load environment variables from
##
envFromSecrets:
- name: postgres-secret
# - name: extra-secret

## @param irisworker.securityContext securityContext for irisworker
##
Expand Down