Admin secrets (#1087)

* add stringdata Signed-off-by: wild-endeavor <[email protected]> * extra dash Signed-off-by: wild-endeavor <[email protected]> * wrong file Signed-off-by: wild-endeavor <[email protected]> * make helm Signed-off-by: wild-endeavor <[email protected]> Co-authored-by: Haytham Abuelfutuh <[email protected]>
flyteorg · Jun 25, 2021 · ef4b75c · ef4b75c
1 parent 83da34d
commit ef4b75c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/deployment/eks/flyte_helm_generated.yaml b/deployment/eks/flyte_helm_generated.yaml
@@ -54,9 +54,10 @@ metadata:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: flyte-admin-auth
+  name: flyte-admin-secrets
   namespace: flyte
 type: Opaque
+stringData:
 ---
 # Source: flyte/templates/common/secret.yaml
 apiVersion: v1
@@ -1421,7 +1422,7 @@ spec:
           name: resource-templates
         - name: auth
           secret:
-            secretName: flyte-admin-auth
+            secretName: flyte-admin-secrets
       affinity: 
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

diff --git a/deployment/gcp/flyte_helm_generated.yaml b/deployment/gcp/flyte_helm_generated.yaml
@@ -116,9 +116,10 @@ metadata:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: flyte-admin-auth
+  name: flyte-admin-secrets
   namespace: flyte
 type: Opaque
+stringData:
 ---
 # Source: flyte/templates/propeller/secret-auth.yaml
 apiVersion: v1
@@ -3259,7 +3260,7 @@ spec:
           name: resource-templates
         - name: auth
           secret:
-            secretName: flyte-admin-auth
+            secretName: flyte-admin-secrets
 ---
 # Source: flyte/templates/console/deployment.yaml
 apiVersion: apps/v1

diff --git a/deployment/sandbox/flyte_helm_generated.yaml b/deployment/sandbox/flyte_helm_generated.yaml
@@ -180,9 +180,10 @@ type: Opaque
 apiVersion: v1
 kind: Secret
 metadata:
-  name: flyte-admin-auth
+  name: flyte-admin-secrets
   namespace: flyte
 type: Opaque
+stringData:
 ---
 # Source: flyte/templates/propeller/secret-auth.yaml
 apiVersion: v1
@@ -3424,7 +3425,7 @@ spec:
           name: resource-templates
         - name: auth
           secret:
-            secretName: flyte-admin-auth
+            secretName: flyte-admin-secrets
 ---
 # Source: flyte/templates/console/deployment.yaml
 apiVersion: apps/v1

diff --git a/helm/README.md b/helm/README.md
@@ -130,6 +130,7 @@ helm upgrade -f values-sandbox.yaml flyte .
 | flyteadmin.podAnnotations | object | `{}` | Annotations for Flyteadmin pods |
 | flyteadmin.replicaCount | int | `1` | Replicas count for Flyteadmin deployment |
 | flyteadmin.resources | object | `{"limits":{"cpu":"250m","ephemeral-storage":"100Mi","memory":"500Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"50Mi"}}` | Default resources requests and limits for Flyteadmin deployment |
+| flyteadmin.secrets | object | `{}` |  |
 | flyteadmin.service | object | `{"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"loadBalancerSourceRanges":[],"type":"ClusterIP"}` | Service settings for Flyteadmin |
 | flyteadmin.serviceAccount | object | `{"annotations":{},"create":true,"imagePullSecrets":{}}` | Configuration for service accounts for FlyteAdmin |
 | flyteadmin.serviceAccount.annotations | object | `{}` | Annotations for ServiceAccount attached to Flyteadmin pods |

diff --git a/helm/templates/admin/deployment.yaml b/helm/templates/admin/deployment.yaml
@@ -144,7 +144,7 @@ spec:
         {{- end }}
         - name: auth
           secret:
-            secretName: flyte-admin-auth
+            secretName: flyte-admin-secrets
       {{- with .Values.flyteadmin.nodeSelector }}
       nodeSelector: {{ toYaml . | nindent 8 }}
       {{- end }}

diff --git a/helm/templates/admin/secret-auth.yaml b/helm/templates/admin/secret-auth.yaml
@@ -1,6 +1,10 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: flyte-admin-auth
+  name: flyte-admin-secrets
   namespace: {{ template "flyte.namespace" . }}
 type: Opaque
+stringData:
+{{- with .Values.flyteadmin.secrets -}}
+{{ toYaml . | nindent 2 }}
+{{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -56,6 +56,7 @@ flyteadmin:
   tolerations: []
   # -- affinity for Flyteadmin deployment
   affinity: {}
+  secrets: {}
 
 #
 # DATACATALOG SETTINGS