Skip to content
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

Jump to bottom

Changed fernetkey-secret, redis-broker-url, redis-password to lookup function #44197

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+26 −35
Open

Changed fernetkey-secret, redis-broker-url, redis-password to lookup function #44197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
177890d
Changed fernetkey-secret to lookup function
Nov 19, 2024
64eecd6
Changed redis broker url and password secrets to use lookup function
Nov 19, 2024
4720310
removed helm hooks assertion unit tests for fernet-secret and redis-s…
Nov 19, 2024
16257c4
fixup redis-secret
Nov 19, 2024
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
16 changes: 10 additions & 6 deletions chart/templates/secrets/fernetkey-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
## Airflow Fernet Key Secret
#################################
{{- if not .Values.fernetKeySecretName }}
{{- $generated_fernet_key := (randAlphaNum 32 | b64enc) }}
{{- $fernetSecretName := printf "%s-%s" .Release.Name "fernet-key" }}
apiVersion: v1
kind: Secret
metadata:
Expand All @@ -34,11 +34,15 @@ metadata:
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
annotations:
"helm.sh/hook": "pre-install"
"helm.sh/hook-delete-policy": "before-hook-creation"
"helm.sh/hook-weight": "0"
type: Opaque
data:
fernet-key: {{ (default $generated_fernet_key .Values.fernetKey) | b64enc | quote }}
{{- $previousSecretData := lookup "v1" "Secret" .Release.Namespace $fernetSecretName }}
{{- if $previousSecretData }}
{{- $previousSecret := index $previousSecretData.data "fernet-key"}}
"fernet-key": {{ $previousSecret }}
{{- else if .Values.fernetKey }}
"fernet-key": {{ .Values.fernetKey | b64enc | quote }}
{{- else }}
"fernet-key": {{ randAlphaNum 32 | b64enc | quote }}
{{- end }}
{{- end }}
28 changes: 16 additions & 12 deletions chart/templates/secrets/redis-secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#################################
{{- $random_redis_password := randAlphaNum 10 }}
{{- if and .Values.redis.enabled (not .Values.redis.passwordSecretName) }}
{{- $redisPasswordSecret := printf "%s-%s" .Release.Name "redis-password" }}
# If passwordSecretName is not set, we will either use the set password, or use the generated one
apiVersion: v1
kind: Secret
Expand All @@ -43,16 +44,19 @@ metadata:
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
annotations:
"helm.sh/hook": "pre-install"
"helm.sh/hook-delete-policy": "before-hook-creation"
"helm.sh/hook-weight": "0"
type: Opaque
data:
password: {{ (default $random_redis_password .Values.redis.password) | b64enc | quote }}
{{- $previousSecretData := lookup "v1" "Secret" .Release.Namespace $redisPasswordSecret }}
{{- if $previousSecretData }}
{{- $previousSecret := index $previousSecretData.data "password"}}
"password": {{ $previousSecret }}
{{- else }}
"password": {{ (default $random_redis_password .Values.redis.password) | b64enc | quote }}
{{- end }}
---
{{- end }}
{{- if not .Values.data.brokerUrlSecretName }}
{{- $redisBrokerSecret := printf "%s-%s" .Release.Name "broker-url" }}
##################################
## Airflow Redis Connection Secret
##################################
Expand All @@ -69,15 +73,15 @@ metadata:
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
annotations:
"helm.sh/hook": "pre-install"
"helm.sh/hook-delete-policy": "before-hook-creation"
"helm.sh/hook-weight": "0"
type: Opaque
data:
{{- if .Values.redis.enabled }}
connection: {{ urlJoin (dict "scheme" "redis" "userinfo" (printf ":%s" ((default $random_redis_password .Values.redis.password) | urlquery)) "host" (printf "%s-redis:6379" (include "airflow.fullname" .) ) "path" "/0") | b64enc | quote }}
{{- $previousSecretData := lookup "v1" "Secret" .Release.Namespace $redisBrokerSecret }}
{{- if and ($previousSecretData) (.Values.redis.enabled) }}
{{- $previousSecret := index $previousSecretData.data "connection"}}
"connection": {{ $previousSecret }}
{{- else if .Values.redis.enabled }}
"connection": {{ urlJoin (dict "scheme" "redis" "userinfo" (printf ":%s" ((default $random_redis_password .Values.redis.password) | urlquery)) "host" (printf "%s-redis:6379" (include "airflow.fullname" .) ) "path" "/0") | b64enc | quote }}
{{- else }}
connection: {{ (printf "%s" .Values.data.brokerUrl) | b64enc | quote }}
"connection": {{ (printf "%s" .Values.data.brokerUrl) | b64enc | quote }}
{{- end }}
{{- end }}
7 changes: 0 additions & 7 deletions helm_tests/airflow_aux/test_airflow_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,13 +304,6 @@ def test_should_use_correct_default_image(self, expected_image, tag, digest):
for doc in docs:
assert expected_image == jmespath.search("spec.template.spec.initContainers[0].image", doc)

def test_should_set_correct_helm_hooks_weight(self):
docs = render_chart(
show_only=["templates/secrets/fernetkey-secret.yaml"],
)
annotations = jmespath.search("metadata.annotations", docs[0])
assert annotations["helm.sh/hook-weight"] == "0"

def test_should_disable_some_variables(self):
docs = render_chart(
values={
Expand Down
10 changes: 0 additions & 10 deletions helm_tests/other/test_redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,16 +349,6 @@ def test_redis_resources_are_not_added_by_default(self):
)
assert jmespath.search("spec.template.spec.containers[0].resources", docs[0]) == {}

def test_should_set_correct_helm_hooks_weight(self):
docs = render_chart(
values={
"executor": "CeleryExecutor",
},
show_only=["templates/secrets/redis-secrets.yaml"],
)
annotations = jmespath.search("metadata.annotations", docs[0])
assert annotations["helm.sh/hook-weight"] == "0"

def test_persistence_volume_annotations(self):
docs = render_chart(
values={"redis": {"persistence": {"annotations": {"foo": "bar"}}}},
Expand Down