diff --git a/charts/flyte-core/README.md b/charts/flyte-core/README.md index 673ba7b6ef5..d75d273f421 100644 --- a/charts/flyte-core/README.md +++ b/charts/flyte-core/README.md @@ -288,6 +288,7 @@ helm install gateway bitnami/contour -n flyte | secrets.adminOauthClientCredentials.clientId | string | `"flytepropeller"` | | | secrets.adminOauthClientCredentials.clientSecret | string | `"foobar"` | | | secrets.adminOauthClientCredentials.enabled | bool | `true` | | +| secrets.adminOauthClientCredentials.secretName | string | `"flyte-secret-auth"` | | | sparkoperator | object | `{"enabled":false,"plugin_config":{"plugins":{"spark":{"spark-config-default":[{"spark.hadoop.fs.s3a.aws.credentials.provider":"com.amazonaws.auth.DefaultAWSCredentialsProviderChain"},{"spark.hadoop.mapreduce.fileoutputcommitter.algorithm.version":"2"},{"spark.kubernetes.allocation.batch.size":"50"},{"spark.hadoop.fs.s3a.acl.default":"BucketOwnerFullControl"},{"spark.hadoop.fs.s3n.impl":"org.apache.hadoop.fs.s3a.S3AFileSystem"},{"spark.hadoop.fs.AbstractFileSystem.s3n.impl":"org.apache.hadoop.fs.s3a.S3A"},{"spark.hadoop.fs.s3.impl":"org.apache.hadoop.fs.s3a.S3AFileSystem"},{"spark.hadoop.fs.AbstractFileSystem.s3.impl":"org.apache.hadoop.fs.s3a.S3A"},{"spark.hadoop.fs.s3a.impl":"org.apache.hadoop.fs.s3a.S3AFileSystem"},{"spark.hadoop.fs.AbstractFileSystem.s3a.impl":"org.apache.hadoop.fs.s3a.S3A"},{"spark.hadoop.fs.s3a.multipart.threshold":"536870912"},{"spark.blacklist.enabled":"true"},{"spark.blacklist.timeout":"5m"},{"spark.task.maxfailures":"8"}]}}}}` | Optional: Spark Plugin using the Spark Operator | | sparkoperator.enabled | bool | `false` | - enable or disable Sparkoperator deployment installation | | sparkoperator.plugin_config | object | `{"plugins":{"spark":{"spark-config-default":[{"spark.hadoop.fs.s3a.aws.credentials.provider":"com.amazonaws.auth.DefaultAWSCredentialsProviderChain"},{"spark.hadoop.mapreduce.fileoutputcommitter.algorithm.version":"2"},{"spark.kubernetes.allocation.batch.size":"50"},{"spark.hadoop.fs.s3a.acl.default":"BucketOwnerFullControl"},{"spark.hadoop.fs.s3n.impl":"org.apache.hadoop.fs.s3a.S3AFileSystem"},{"spark.hadoop.fs.AbstractFileSystem.s3n.impl":"org.apache.hadoop.fs.s3a.S3A"},{"spark.hadoop.fs.s3.impl":"org.apache.hadoop.fs.s3a.S3AFileSystem"},{"spark.hadoop.fs.AbstractFileSystem.s3.impl":"org.apache.hadoop.fs.s3a.S3A"},{"spark.hadoop.fs.s3a.impl":"org.apache.hadoop.fs.s3a.S3AFileSystem"},{"spark.hadoop.fs.AbstractFileSystem.s3a.impl":"org.apache.hadoop.fs.s3a.S3A"},{"spark.hadoop.fs.s3a.multipart.threshold":"536870912"},{"spark.blacklist.enabled":"true"},{"spark.blacklist.timeout":"5m"},{"spark.task.maxfailures":"8"}]}}}` | Spark plugin configuration | diff --git a/charts/flyte-core/templates/clusterresourcesync/deployment.yaml b/charts/flyte-core/templates/clusterresourcesync/deployment.yaml index 9108a0b3354..2b0bef803e8 100644 --- a/charts/flyte-core/templates/clusterresourcesync/deployment.yaml +++ b/charts/flyte-core/templates/clusterresourcesync/deployment.yaml @@ -83,7 +83,7 @@ spec: {{- if .Values.secrets.adminOauthClientCredentials.enabled }} - name: auth secret: - secretName: flyte-secret-auth + secretName: {{ .Values.secrets.adminOauthClientCredentials.secretName }} {{- end }} {{- end }} {{- with .Values.cluster_resource_manager.nodeSelector }} diff --git a/charts/flyte-core/templates/common/secret-auth.yaml b/charts/flyte-core/templates/common/secret-auth.yaml index d13247bd9a1..608c0051e77 100644 --- a/charts/flyte-core/templates/common/secret-auth.yaml +++ b/charts/flyte-core/templates/common/secret-auth.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: flyte-secret-auth + name: {{ .Values.secrets.adminOauthClientCredentials.secretName }} namespace: {{ template "flyte.namespace" . }} type: Opaque stringData: diff --git a/charts/flyte-core/templates/propeller/deployment.yaml b/charts/flyte-core/templates/propeller/deployment.yaml index 4308f2d6fa8..1c9d8adb62b 100644 --- a/charts/flyte-core/templates/propeller/deployment.yaml +++ b/charts/flyte-core/templates/propeller/deployment.yaml @@ -108,7 +108,7 @@ spec: {{- if .Values.secrets.adminOauthClientCredentials.enabled }} - name: auth secret: - secretName: flyte-secret-auth + secretName: {{ .Values.secrets.adminOauthClientCredentials.secretName }} {{- end }} {{- with .Values.flytepropeller.additionalVolumes -}} {{ tpl (toYaml .) $ | nindent 6 }} diff --git a/charts/flyte-core/values.yaml b/charts/flyte-core/values.yaml index 93c0d9b3894..26587206966 100755 --- a/charts/flyte-core/values.yaml +++ b/charts/flyte-core/values.yaml @@ -473,6 +473,7 @@ secrets: enabled: true clientSecret: foobar clientId: flytepropeller + secretName: flyte-secret-auth # # WEBHOOK SETTINGS