Skip to content

ctx/feat(dataplane): add settable storage domain suffix for azure #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ctxswitch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ctx/feat(dataplane): add settable storage domain suffix for azure #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions charts/dataplane/values.azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
# ----------------------------------------------------------------------------
Expand Down Expand Up @@ -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: ""
Expand Down Expand Up @@ -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 }}`}}'

Expand Down Expand Up @@ -300,4 +309,4 @@ dcgm-exporter:
- key: kubernetes.azure.com/accelerator
operator: In
values:
- "nvidia"
- "nvidia"
15 changes: 10 additions & 5 deletions tests/generated/dataplane.azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2695,6 +2695,7 @@ data:
stow:
config:
account: 'test-storage-account'
domain_suffix: 'core.windows.net'
kind: azure
type: stow
enable-multicontainer: true
Expand Down Expand Up @@ -2781,6 +2782,7 @@ data:
stow:
config:
account: 'test-storage-account'
domain_suffix: 'core.windows.net'
kind: azure
type: stow
collectUsages:
Expand Down Expand Up @@ -2835,6 +2837,7 @@ data:
stow:
config:
account: 'test-storage-account'
domain_suffix: 'core.windows.net'
kind: azure
type: stow
enable-multicontainer: true
Expand All @@ -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"
Expand Down Expand Up @@ -3950,6 +3954,7 @@ data:
stow:
config:
account: 'test-storage-account'
domain_suffix: 'core.windows.net'
kind: azure
type: stow
enable-multicontainer: true
Expand Down Expand Up @@ -5532,7 +5537,7 @@ spec:
template:
metadata:
annotations:
configChecksum: "735ea8c09e5e58e420bf6438f47edddc86f0173eaa8679f391775ae44fcb2ab"
configChecksum: "530712dd9de85756bc05e33fa13d7c018083a076099545a5d5656de45210814"
labels:

azure.workload.identity/use: "true"
Expand Down Expand Up @@ -5634,7 +5639,7 @@ spec:
template:
metadata:
annotations:
configChecksum: "1699a41137999cb4d3d89745242b0e46fde48ad37823cd695dbd5f068777e94"
configChecksum: "671f5e30d50cb1b7a25b256148310fe752fda14bbb149c3e8fee29734585f18"

labels:

Expand Down Expand Up @@ -5772,7 +5777,7 @@ spec:
template:
metadata:
annotations:
configChecksum: "1699a41137999cb4d3d89745242b0e46fde48ad37823cd695dbd5f068777e94"
configChecksum: "671f5e30d50cb1b7a25b256148310fe752fda14bbb149c3e8fee29734585f18"

labels:

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -6112,7 +6117,7 @@ spec:
template:
metadata:
annotations:
configChecksum: "d4bcd8601d583eb3f54b7012d472f044f8029e3e70d2eaeeab0b6d57c299f23"
configChecksum: "6a597783f98548012ac4d17305bcc0911c8421539c515845ba1d74780515dd2"

labels:

Expand Down
3 changes: 2 additions & 1 deletion tests/values/dataplane.azure-custom-storage-prefix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 }}`}}'

Expand Down
6 changes: 4 additions & 2 deletions tests/values/dataplane.azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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: ""
Expand Down Expand Up @@ -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 }}`}}'

Expand Down Expand Up @@ -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: ''
token: ''
Loading