Formalize oidc_client_secret in flyte-admin-secrets

- When setting up integrations with an IdP like Keycloak, the oidc_client_secret must also be set in flyte-admin-secrets. Formalize that and make it more discoverable Signed-off-by: ddl-ebrown <[email protected]>
flyteorg · Jul 12, 2024 · b3e424e · b3e424e
1 parent 25158b0
commit b3e424e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 0 deletions.
diff --git a/charts/flyte-core/templates/admin/secret.yaml b/charts/flyte-core/templates/admin/secret.yaml
@@ -13,6 +13,7 @@ data:
   cookie_hash_key: {{ index $secret.data "cookie_hash_key" }}
   cookie_block_key: {{ index $secret.data "cookie_block_key" }}
   claim_symmetric_key: {{ index $secret.data "claim_symmetric_key" }}
+  oidc_client_secret: {{ index $secret.data "oidc_client_secret" }}
 {{- else }}
   token_rsa_key.pem: |
     {{ genPrivateKey "rsa" | b64enc }}
@@ -22,6 +23,9 @@ stringData:
   cookie_hash_key: {{ trimSuffix "==" (randBytes 64) | quote }}
   cookie_block_key: {{ trimSuffix "=" (randBytes 32) | quote }}
   claim_symmetric_key: {{ trimSuffix "=" (randBytes 32) | quote }}
+{{- if .Values.secrets.adminOauthClientCredentials.enabled }}
+  oidc_client_secret: {{ .Values.secrets.adminOauthClientCredentials.clientSecret | quote }}
+{{- end }}
 {{- end }}
 {{- with .Values.flyteadmin.secrets -}}
 {{ tpl (toYaml .) $ | nindent 2 }}

diff --git a/deployment/eks/flyte_aws_scheduler_helm_generated.yaml b/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
@@ -63,6 +63,7 @@ stringData:
   cookie_hash_key: "MuJrZ6SO749aiiuCUHTt0soA9wTTc1hyL8joh+UWZ9AqwxJ0GH5fjwDM0EF5umqLUg81nl3MGqD108vZPad4eA"
   cookie_block_key: "4lcZsm7g6hAac3c2O8i5QV04jewLPDUT+QfwdGkfONI"
   claim_symmetric_key: "seUw6e6wnsbCuAaW1L2U/iLItvtIWxlNAUQ3r9Gozj8"
+  oidc_client_secret: "foobar"
 ---
 # Source: flyte-core/templates/common/secret-auth.yaml
 apiVersion: v1

diff --git a/deployment/eks/flyte_helm_controlplane_generated.yaml b/deployment/eks/flyte_helm_controlplane_generated.yaml
@@ -53,6 +53,7 @@ stringData:
   cookie_hash_key: "1F+qN7eZFwjiFNDsHXCakfzy4/48fQsRgrsRb/afdkNEG6JtQHPH/Z+I7KIa6NC09fX3G2rEIv60Ilalj30MrQ"
   cookie_block_key: "FYhmYGHm+19l0TKL6iimMoGRuqElhy6XWkBU9IARdI8"
   claim_symmetric_key: "6uOdTrZ70G3osUcym8w2koLkwI+peRgwX0O/V9oSawU"
+  oidc_client_secret: "foobar"
 ---
 # Source: flyte-core/templates/common/secret-auth.yaml
 apiVersion: v1

diff --git a/deployment/eks/flyte_helm_generated.yaml b/deployment/eks/flyte_helm_generated.yaml
@@ -75,6 +75,7 @@ stringData:
   cookie_hash_key: "4EfCL3f4u3SEl7fGNd0hUqnfASxC6W1oFOQH7njT8NSFhZQV78Y4H/xRxa/ttF9QfTd/Th79s3W+w+ATo5IAlA"
   cookie_block_key: "FivnWNlPDsZ988UdMuUoS7SEghTA91QYfYHi7npCCP8"
   claim_symmetric_key: "qGeM76T9DLdOoFhoefC7sy9rzvm/EehF8bj2BDNvTU8"
+  oidc_client_secret: "foobar"
 ---
 # Source: flyte-core/templates/common/secret-auth.yaml
 apiVersion: v1

diff --git a/deployment/gcp/flyte_helm_controlplane_generated.yaml b/deployment/gcp/flyte_helm_controlplane_generated.yaml
@@ -53,6 +53,7 @@ stringData:
   cookie_hash_key: "224C3Ib4Ot7syRdB4Sow85SP+0qFy4ajoblBfrg2jZ6ZbGNWjN4qovT5ISlAUbVH4Jjcjc5QmTH3JgRLRRVZqA"
   cookie_block_key: "8y9sMLhYYEBE8x3kNIm4u0NSM38pXjwBKYOhRywl9Fg"
   claim_symmetric_key: "OSQU5zyXmgCd8tNCreYxec0w5Y2H8Lfyt+7jSlkG9HE"
+  oidc_client_secret: "foobar"
 ---
 # Source: flyte-core/templates/common/secret-auth.yaml
 apiVersion: v1

diff --git a/deployment/gcp/flyte_helm_generated.yaml b/deployment/gcp/flyte_helm_generated.yaml
@@ -75,6 +75,7 @@ stringData:
   cookie_hash_key: "uc95qZyRRLaA/uAO1RuEX7NqDD8Mw2JWnF/VpFuujFth+mmbvmloe6cS1AqL1fVhHsgmDf39qAJ/wRK3u9hp0A"
   cookie_block_key: "vqdfBTFgSZWohVAfCICTEvOlnO0zt1oykTvqLq+Jwig"
   claim_symmetric_key: "R1Tre/w/OacURlkTJZ48bWyMqlMfEtlhRV9/h9CJ1Q8"
+  oidc_client_secret: "foobar"
 ---
 # Source: flyte-core/templates/common/secret-auth.yaml
 apiVersion: v1

diff --git a/deployment/sandbox/flyte_helm_generated.yaml b/deployment/sandbox/flyte_helm_generated.yaml
@@ -123,6 +123,7 @@ stringData:
   cookie_hash_key: "PJ9zto3iT6VOnUl7n0wC1U4GgSv7+Tf/YL5ceObYL4aQJMH+woZqTicYGeTb2B1wowmCl+BG9eW4oA7kD9wDIQ"
   cookie_block_key: "jexJFHkPp9jgn0xoI4mpO/k7/9dyzR7415Dl75uebW0"
   claim_symmetric_key: "4x8n7MqI+FPPOcN+DnremPA/l6ZAs8tL0Z2P18yijfk"
+  oidc_client_secret: "foobar"
 ---
 # Source: flyte/charts/flyte/templates/common/secret-auth.yaml
 apiVersion: v1