diff --git a/charts/dataplane/values.azure.yaml b/charts/dataplane/values.azure.yaml index aa9a0f5b..bc131418 100644 --- a/charts/dataplane/values.azure.yaml +++ b/charts/dataplane/values.azure.yaml @@ -91,6 +91,13 @@ global: # Note: Key Vault must exist with appropriate access policies AZURE_KEY_VAULT_URI: "" + # 13. AZURE_STORAGE_DOMAIN_SUFFIX - Azure storage domain suffix + # Format: Domain suffix string + # Default: "core.windows.net" (Azure Public Cloud) + # Override: For custom DNS configurations (e.g., Azure Private Endpoints + # with custom domains), set to your custom domain suffix + AZURE_STORAGE_DOMAIN_SUFFIX: "core.windows.net" + # ---------------------------------------------------------------------------- # SECTION 2: Core Identity Configuration (REQUIRED) # ---------------------------------------------------------------------------- @@ -120,6 +127,8 @@ storage: config: # Storage account name account: '{{ .Values.global.AZURE_STORAGE_ACCOUNT }}' + # Azure storage domain suffix for signed URL generation + domain_suffix: '{{ .Values.global.AZURE_STORAGE_DOMAIN_SUFFIX }}' # Leave key empty to use Workload Identity / Managed Identity authentication # For key-based auth, provide the storage account access key # key: "" @@ -207,7 +216,7 @@ config: operator: clusterData: # Azure Blob Storage path format (ABFS protocol for Data Lake Storage Gen2) - metadataBucketPrefix: "abfs://{{.Values.global.METADATA_CONTAINER}}@{{.Values.global.AZURE_STORAGE_ACCOUNT}}.dfs.core.windows.net" + metadataBucketPrefix: "abfs://{{.Values.global.METADATA_CONTAINER}}@{{.Values.global.AZURE_STORAGE_ACCOUNT}}.dfs.{{.Values.global.AZURE_STORAGE_DOMAIN_SUFFIX}}" org: namespaceTemplate: '{{`{{ domain }}`}}' @@ -300,4 +309,4 @@ dcgm-exporter: - key: kubernetes.azure.com/accelerator operator: In values: - - "nvidia" \ No newline at end of file + - "nvidia" diff --git a/tests/generated/dataplane.azure.yaml b/tests/generated/dataplane.azure.yaml index 9dc2fa60..74e3b922 100644 --- a/tests/generated/dataplane.azure.yaml +++ b/tests/generated/dataplane.azure.yaml @@ -2695,6 +2695,7 @@ data: stow: config: account: 'test-storage-account' + domain_suffix: 'core.windows.net' kind: azure type: stow enable-multicontainer: true @@ -2781,6 +2782,7 @@ data: stow: config: account: 'test-storage-account' + domain_suffix: 'core.windows.net' kind: azure type: stow collectUsages: @@ -2835,6 +2837,7 @@ data: stow: config: account: 'test-storage-account' + domain_suffix: 'core.windows.net' kind: azure type: stow enable-multicontainer: true @@ -2850,6 +2853,7 @@ data: stow: config: account: 'test-storage-account' + domain_suffix: 'core.windows.net' kind: azure type: stow image-builder.buildkit-uri: "tcp://union-operator-buildkit.union.svc.cluster.local:1234" @@ -3950,6 +3954,7 @@ data: stow: config: account: 'test-storage-account' + domain_suffix: 'core.windows.net' kind: azure type: stow enable-multicontainer: true @@ -5532,7 +5537,7 @@ spec: template: metadata: annotations: - configChecksum: "735ea8c09e5e58e420bf6438f47edddc86f0173eaa8679f391775ae44fcb2ab" + configChecksum: "530712dd9de85756bc05e33fa13d7c018083a076099545a5d5656de45210814" labels: azure.workload.identity/use: "true" @@ -5634,7 +5639,7 @@ spec: template: metadata: annotations: - configChecksum: "1699a41137999cb4d3d89745242b0e46fde48ad37823cd695dbd5f068777e94" + configChecksum: "671f5e30d50cb1b7a25b256148310fe752fda14bbb149c3e8fee29734585f18" labels: @@ -5772,7 +5777,7 @@ spec: template: metadata: annotations: - configChecksum: "1699a41137999cb4d3d89745242b0e46fde48ad37823cd695dbd5f068777e94" + configChecksum: "671f5e30d50cb1b7a25b256148310fe752fda14bbb149c3e8fee29734585f18" labels: @@ -5957,7 +5962,7 @@ spec: platform.union.ai/service-group: release-name app.kubernetes.io/managed-by: Helm annotations: - configChecksum: "d4bcd8601d583eb3f54b7012d472f044f8029e3e70d2eaeeab0b6d57c299f23" + configChecksum: "6a597783f98548012ac4d17305bcc0911c8421539c515845ba1d74780515dd2" spec: securityContext: @@ -6112,7 +6117,7 @@ spec: template: metadata: annotations: - configChecksum: "d4bcd8601d583eb3f54b7012d472f044f8029e3e70d2eaeeab0b6d57c299f23" + configChecksum: "6a597783f98548012ac4d17305bcc0911c8421539c515845ba1d74780515dd2" labels: diff --git a/tests/values/dataplane.azure-custom-storage-prefix.yaml b/tests/values/dataplane.azure-custom-storage-prefix.yaml index ced450cd..1042ef8a 100644 --- a/tests/values/dataplane.azure-custom-storage-prefix.yaml +++ b/tests/values/dataplane.azure-custom-storage-prefix.yaml @@ -14,6 +14,7 @@ global: AZURE_BACKEND_CLIENT_ID: "test-backend-client-id" AZURE_WORKER_CLIENT_ID: "test-worker-client-id" AZURE_KEY_VAULT_URI: "test-azure-key-vault-uri" + AZURE_STORAGE_DOMAIN_SUFFIX: "core.windows.net" provider: azure @@ -64,7 +65,7 @@ config: operator: clusterData: - metadataBucketPrefix: "abfs://{{.Values.global.METADATA_CONTAINER}}@{{.Values.global.AZURE_STORAGE_ACCOUNT}}.dfs.core.windows.net" + metadataBucketPrefix: "abfs://{{.Values.global.METADATA_CONTAINER}}@{{.Values.global.AZURE_STORAGE_ACCOUNT}}.dfs.{{.Values.global.AZURE_STORAGE_DOMAIN_SUFFIX}}" org: namespaceTemplate: '{{`{{ domain }}`}}' diff --git a/tests/values/dataplane.azure.yaml b/tests/values/dataplane.azure.yaml index 495564e3..a1370b8c 100644 --- a/tests/values/dataplane.azure.yaml +++ b/tests/values/dataplane.azure.yaml @@ -14,6 +14,7 @@ global: AZURE_BACKEND_CLIENT_ID: "test-backend-client-id" AZURE_WORKER_CLIENT_ID: "test-worker-client-id" AZURE_KEY_VAULT_URI: "test-azure-key-vault-uri" + AZURE_STORAGE_DOMAIN_SUFFIX: "core.windows.net" # ---------------------------------------------------------------------------- # SECTION 2: Core Identity Configuration (REQUIRED) @@ -43,6 +44,7 @@ storage: config: # Storage account name account: '{{ .Values.global.AZURE_STORAGE_ACCOUNT }}' + domain_suffix: '{{ .Values.global.AZURE_STORAGE_DOMAIN_SUFFIX }}' # Leave key empty to use Workload Identity / Managed Identity authentication # For key-based auth, provide the storage account access key # key: "" @@ -127,7 +129,7 @@ config: operator: clusterData: # Azure Blob Storage path format (ABFS protocol for Data Lake Storage Gen2) - metadataBucketPrefix: "abfs://{{.Values.global.METADATA_CONTAINER}}@{{.Values.global.AZURE_STORAGE_ACCOUNT}}.dfs.core.windows.net" + metadataBucketPrefix: "abfs://{{.Values.global.METADATA_CONTAINER}}@{{.Values.global.AZURE_STORAGE_ACCOUNT}}.dfs.{{.Values.global.AZURE_STORAGE_DOMAIN_SUFFIX}}" org: namespaceTemplate: '{{`{{ domain }}`}}' @@ -267,4 +269,4 @@ prometheus: token: '' k8s-views-pods: url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-views-pods.json - token: '' \ No newline at end of file + token: ''