Skip to content

Commit

Permalink
Fix helm (#26752)
Browse files Browse the repository at this point in the history
## Summary & Motivation
Didn't forward the new prop to helm. This fixes

## How I Tested These Changes
Previously failing tests now pass on local
  • Loading branch information
dpeng817 authored Dec 30, 2024
1 parent b9dd154 commit 76e64e1
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class AzureBlobComputeLogManager(BaseModel):
container: StringSource
secretCredential: Optional[dict] = None
defaultAzureCredential: Optional[dict] = None
accessKeyOrSasToken: Optional[StringSource] = None
localDir: Optional[StringSource] = None
prefix: Optional[StringSource] = None
uploadInterval: Optional[int] = None
Expand Down
3 changes: 3 additions & 0 deletions helm/dagster/schema/schema_tests/test_instance.py
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,7 @@ def test_azure_blob_compute_log_manager(template: HelmTemplate):
container = "container"
secret_credential = {"client_id": "id", "client_secret": "secret", "tenant_id": "tenant"}
default_azure_credential = {"exclude_cli_credential": True}
access_key_or_sas_token = "token"
local_dir = "/dir"
prefix = "prefix"
upload_interval = 30
Expand All @@ -708,6 +709,7 @@ def test_azure_blob_compute_log_manager(template: HelmTemplate):
container=container,
secretCredential=secret_credential,
defaultAzureCredential=default_azure_credential,
accessKeyOrSasToken=access_key_or_sas_token,
localDir=local_dir,
prefix=prefix,
uploadInterval=upload_interval,
Expand All @@ -731,6 +733,7 @@ def test_azure_blob_compute_log_manager(template: HelmTemplate):
"local_dir": local_dir,
"prefix": prefix,
"upload_interval": upload_interval,
"access_key_or_sas_token": access_key_or_sas_token,
}

# Test all config fields in configurable class
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ config:
secret_credential: {{ $azureBlobComputeLogManagerConfig.secretCredential | toYaml | nindent 4 }}
{{- end }}

{{- if $azureBlobComputeLogManagerConfig.accessKeyOrSasToken }}
access_key_or_sas_token: {{ include "stringSource" $azureBlobComputeLogManagerConfig.accessKeyOrSasToken }}
{{- end }}

{{- if $azureBlobComputeLogManagerConfig.localDir }}
local_dir: {{ include "stringSource" $azureBlobComputeLogManagerConfig.localDir }}
{{- end }}
Expand Down
15 changes: 15 additions & 0 deletions helm/dagster/values.schema.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions helm/dagster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ computeLogManager:
# container: ~
# secretCredential: ~
# defaultAzureCredential: ~
# accessKeyOrSasToken: ~
# localDir: ~
# prefix: ~
# uploadInterval: ~
Expand Down

0 comments on commit 76e64e1

Please sign in to comment.