From aff9750c450ab9d71af1b8d1cff6ab90db961420 Mon Sep 17 00:00:00 2001 From: cgrass <2934572+cgrass@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:41:01 -0600 Subject: [PATCH] Update configmap and helper to support azure storage (#4328) --- charts/flyte-binary/README.md | 4 ++++ charts/flyte-binary/templates/_helpers.tpl | 2 ++ charts/flyte-binary/templates/configmap.yaml | 15 +++++++++++++++ charts/flyte-binary/values.yaml | 10 ++++++++++ 4 files changed, 31 insertions(+) diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md index af90288ab7..9807e8e221 100644 --- a/charts/flyte-binary/README.md +++ b/charts/flyte-binary/README.md @@ -66,6 +66,10 @@ Chart for basic single Flyte executable deployment | configuration.logging.plugins.stackdriver.templateUri | string | `""` | | | configuration.storage.metadataContainer | string | `"my-organization-flyte-container"` | | | configuration.storage.provider | string | `"s3"` | | +| configuration.storage.providerConfig.azure.account | string | `"storage-account-name"` | | +| configuration.storage.providerConfig.azure.configDomainSuffix | string | `""` | | +| configuration.storage.providerConfig.azure.configUploadConcurrency | int | `4` | | +| configuration.storage.providerConfig.azure.key | string | `""` | | | configuration.storage.providerConfig.gcs.project | string | `"my-organization-gcp-project"` | | | configuration.storage.providerConfig.s3.accessKey | string | `""` | | | configuration.storage.providerConfig.s3.authType | string | `"iam"` | | diff --git a/charts/flyte-binary/templates/_helpers.tpl b/charts/flyte-binary/templates/_helpers.tpl index d7572058ed..92e8fa4636 100644 --- a/charts/flyte-binary/templates/_helpers.tpl +++ b/charts/flyte-binary/templates/_helpers.tpl @@ -99,6 +99,8 @@ Get the Flyte user data prefix. {{- printf "s3://%s/data" $userDataContainer -}} {{- else if eq "gcs" .Values.configuration.storage.provider -}} {{- printf "gs://%s/data" $userDataContainer -}} +{{- else if eq "azure" .Values.configuration.storage.provider -}} +{{- printf "abfs://%s/data" $userDataContainer -}} {{- end -}} {{- end -}} diff --git a/charts/flyte-binary/templates/configmap.yaml b/charts/flyte-binary/templates/configmap.yaml index f5d084dd6a..4c55bf34e3 100644 --- a/charts/flyte-binary/templates/configmap.yaml +++ b/charts/flyte-binary/templates/configmap.yaml @@ -110,6 +110,21 @@ data: {{- printf "Invalid value for S3 storage provider authentication type. Expected one of (iam, accesskey), but got: %s" .authType | fail }} {{- end }} {{- end }} + {{- else if eq "azure" .provider }} + {{- with .providerConfig.azure }} + kind: azure + config: + account: {{ .account }} + {{- if .key }} + key: {{ .key }} + {{- end }} + {{- if .configDomainSuffix }} + configDomainSuffix: {{ .configDomainSuffix }} + {{- end }} + {{- if .configUploadConcurrency }} + configUploadConcurrency: {{ .configUploadConcurrency }} + {{- end }} + {{- end }} {{- else if eq "gcs" .provider }} kind: google config: diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml index c8aec95333..1f9564af3b 100644 --- a/charts/flyte-binary/values.yaml +++ b/charts/flyte-binary/values.yaml @@ -81,6 +81,16 @@ configuration: gcs: # project Google Cloud project in which bucket resides project: "my-organization-gcp-project" + # azure Provider configuration for Azure object store + azure: + # configDomainSuffix Domain name suffix + configDomainSuffix: "" + # configUploadConcurrency Upload Concurrency (default 4) + configUploadConcurrency: 4 + # account Storage Account name + account: "storage-account-name" + # key Storage Account key if used + key: "" # logging Specify configuration for logs emitted by Flyte logging: # level Set the log level