Skip to content

feat: Accept a literal value or secret reference for connection info #339

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
danielpanzella wants to merge 5 commits into
base: main
Choose a base branch
from
Open

feat: Accept a literal value or secret reference for connection info #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3910f77
feat(api): Accept a literal value or secret reference for connection …
danielpanzella Aug 20, 2026
259412e
Merge origin/main into danielpanzella/value-or-secret-connection-fields
danielpanzella Aug 20, 2026
9ee9e8e
feat(api): Accept value or secret reference for notification config f…
danielpanzella Aug 20, 2026
6930a24
chore(deps): Update golang.org/x/mod to 0.40.0
danielpanzella Aug 20, 2026
b4f85b0
Merge origin/main into danielpanzella/value-or-secret-connection-fields
danielpanzella Aug 20, 2026
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
78 changes: 30 additions & 48 deletions api/v1/weightsandbiases_conversion_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,14 +407,8 @@ func mapBucket(globalMap map[string]interface{}, dst *appsv2.WeightsAndBiases) e
if secretKeyName == "" {
secretKeyName = defaultBucketSecretKeyName
}
conn.AccessKey = corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{Name: name},
Key: accessKeyName,
}
conn.SecretKey = corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{Name: name},
Key: secretKeyName,
}
conn.AccessKey = appsv2.ValueFromSecret(name, accessKeyName, false)
conn.SecretKey = appsv2.ValueFromSecret(name, secretKeyName, false)
}
}

Expand Down Expand Up @@ -455,12 +449,12 @@ var mysqlFields = []struct {
v1Key string
setRef func(*appsv2.MysqlConnection, corev1.SecretKeySelector)
}{
{"host", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.Host = s }},
{"port", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.Port = s }},
{"database", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.Database = s }},
{"user", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.Username = s }},
{"password", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.Password = s }},
{"caCert", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.SslCa = s }},
{"host", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.Host = appsv2.ValueFromSelector(s) }},
{"port", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.Port = appsv2.ValueFromSelector(s) }},
{"database", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.Database = appsv2.ValueFromSelector(s) }},
{"user", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.Username = appsv2.ValueFromSelector(s) }},
{"password", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.Password = appsv2.ValueFromSelector(s) }},
{"caCert", func(c *appsv2.MysqlConnection, s corev1.SecretKeySelector) { c.SslCa = appsv2.ValueFromSelector(s) }},
}

// mapMySQL routes valueFrom-shaped fields to externalMysql.*, scalars to
Expand Down Expand Up @@ -500,16 +494,13 @@ func mapMySQL(globalMap map[string]interface{}, dst *appsv2.WeightsAndBiases) er
return fmt.Errorf("spec.values.global.mysql.passwordSecret: %w", err)
} else if ok {
name, _, _ := unstructured.NestedString(ps, "name")
alreadyHasPassword := conn != nil && conn.Password.Name != ""
alreadyHasPassword := conn != nil && conn.Password.SecretKeyRef() != nil
if name != "" && !alreadyHasPassword {
key, _, _ := unstructured.NestedString(ps, "passwordKey")
if key == "" {
key = defaultMySQLPasswordSecretKey
}
conn.Password = corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{Name: name},
Key: key,
}
conn.Password = appsv2.ValueFromSecret(name, key, false)
delete(remaining, "password")
}
}
Expand All @@ -530,11 +521,11 @@ var clickHouseFields = []struct {
v1Key string
setRef func(*appsv2.ClickHouseConnection, corev1.SecretKeySelector)
}{
{"host", func(c *appsv2.ClickHouseConnection, s corev1.SecretKeySelector) { c.Host = s }},
{"port", func(c *appsv2.ClickHouseConnection, s corev1.SecretKeySelector) { c.HTTPPort = s }},
{"database", func(c *appsv2.ClickHouseConnection, s corev1.SecretKeySelector) { c.Database = s }},
{"user", func(c *appsv2.ClickHouseConnection, s corev1.SecretKeySelector) { c.Username = s }},
{"password", func(c *appsv2.ClickHouseConnection, s corev1.SecretKeySelector) { c.Password = s }},
{"host", func(c *appsv2.ClickHouseConnection, s corev1.SecretKeySelector) { c.Host = appsv2.ValueFromSelector(s) }},
{"port", func(c *appsv2.ClickHouseConnection, s corev1.SecretKeySelector) { c.HTTPPort = appsv2.ValueFromSelector(s) }},
{"database", func(c *appsv2.ClickHouseConnection, s corev1.SecretKeySelector) { c.Database = appsv2.ValueFromSelector(s) }},
{"user", func(c *appsv2.ClickHouseConnection, s corev1.SecretKeySelector) { c.Username = appsv2.ValueFromSelector(s) }},
{"password", func(c *appsv2.ClickHouseConnection, s corev1.SecretKeySelector) { c.Password = appsv2.ValueFromSelector(s) }},
}

// mapClickHouse routes v1 global.clickhouse to externalClickhouse (like
Expand Down Expand Up @@ -578,7 +569,7 @@ func mapClickHouse(globalMap map[string]interface{}, dst *appsv2.WeightsAndBiase
if err != nil {
return fmt.Errorf("spec.values.global.clickhouse.passwordSecret.name: %w", err)
}
alreadyHasPassword := conn.Password.Name != ""
alreadyHasPassword := conn.Password.SecretKeyRef() != nil
if name != "" && !alreadyHasPassword {
key, _, err := unstructured.NestedString(ps, "passwordKey")
if err != nil {
Expand All @@ -587,10 +578,7 @@ func mapClickHouse(globalMap map[string]interface{}, dst *appsv2.WeightsAndBiase
if key == "" {
key = defaultClickHousePasswordSecretKey
}
conn.Password = corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{Name: name},
Key: key,
}
conn.Password = appsv2.ValueFromSecret(name, key, false)
delete(remaining, "password")
sawField = true
}
Expand Down Expand Up @@ -651,10 +639,10 @@ var redisFields = []struct {
v1Key string
setRef func(*appsv2.RedisConnection, corev1.SecretKeySelector)
}{
{"host", func(c *appsv2.RedisConnection, s corev1.SecretKeySelector) { c.Host = s }},
{"port", func(c *appsv2.RedisConnection, s corev1.SecretKeySelector) { c.Port = s }},
{"password", func(c *appsv2.RedisConnection, s corev1.SecretKeySelector) { c.Password = s }},
{"caCert", func(c *appsv2.RedisConnection, s corev1.SecretKeySelector) { c.SslCa = s }},
{"host", func(c *appsv2.RedisConnection, s corev1.SecretKeySelector) { c.Host = appsv2.ValueFromSelector(s) }},
{"port", func(c *appsv2.RedisConnection, s corev1.SecretKeySelector) { c.Port = appsv2.ValueFromSelector(s) }},
{"password", func(c *appsv2.RedisConnection, s corev1.SecretKeySelector) { c.Password = appsv2.ValueFromSelector(s) }},
{"caCert", func(c *appsv2.RedisConnection, s corev1.SecretKeySelector) { c.SslCa = appsv2.ValueFromSelector(s) }},
}

// mapRedis routes valueFrom-shaped fields to externalRedis.*, scalars to
Expand Down Expand Up @@ -706,7 +694,7 @@ func mapRedis(globalMap map[string]interface{}, dst *appsv2.WeightsAndBiases) er
return fmt.Errorf("spec.values.global.redis.%s.tls: %w", parent, classifyErr)
}
if ref != nil {
conn.Tls = *ref
conn.Tls = appsv2.ValueFromSelector(*ref)
break
}
if literal != "" {
Expand All @@ -719,16 +707,13 @@ func mapRedis(globalMap map[string]interface{}, dst *appsv2.WeightsAndBiases) er
return fmt.Errorf("spec.values.global.redis.secret: %w", err)
} else if ok {
name, _, _ := unstructured.NestedString(sec, "secretName")
alreadyHasPassword := conn != nil && conn.Password.Name != ""
alreadyHasPassword := conn != nil && conn.Password.SecretKeyRef() != nil
if name != "" && !alreadyHasPassword {
key, _, _ := unstructured.NestedString(sec, "secretKey")
if key == "" {
key = defaultRedisPasswordSecretKey
}
conn.Password = corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{Name: name},
Key: key,
}
conn.Password = appsv2.ValueFromSecret(name, key, false)
delete(remaining, "password")
}
}
Expand All @@ -749,10 +734,10 @@ var oidcFields = []struct {
v1Key string
setRef func(*appsv2.OidcSpec, corev1.SecretKeySelector)
}{
{"clientId", func(o *appsv2.OidcSpec, s corev1.SecretKeySelector) { o.ClientId = s }},
{"secret", func(o *appsv2.OidcSpec, s corev1.SecretKeySelector) { o.ClientSecret = s }},
{"authMethod", func(o *appsv2.OidcSpec, s corev1.SecretKeySelector) { o.AuthMethod = s }},
{"issuer", func(o *appsv2.OidcSpec, s corev1.SecretKeySelector) { o.IssuerUrl = s }},
{"clientId", func(o *appsv2.OidcSpec, s corev1.SecretKeySelector) { o.ClientId = appsv2.ValueFromSelector(s) }},
{"secret", func(o *appsv2.OidcSpec, s corev1.SecretKeySelector) { o.ClientSecret = appsv2.ValueFromSelector(s) }},
{"authMethod", func(o *appsv2.OidcSpec, s corev1.SecretKeySelector) { o.AuthMethod = appsv2.ValueFromSelector(s) }},
{"issuer", func(o *appsv2.OidcSpec, s corev1.SecretKeySelector) { o.IssuerUrl = appsv2.ValueFromSelector(s) }},
}

// mapOIDC routes valueFrom-shaped fields to spec.wandb.oidc.*, scalars to
Expand Down Expand Up @@ -791,16 +776,13 @@ func mapOIDC(globalMap map[string]interface{}, dst *appsv2.WeightsAndBiases) err
return fmt.Errorf("spec.values.global.auth.oidc.oidcSecret: %w", err)
} else if ok {
name, _, _ := unstructured.NestedString(os, "name")
alreadyHasClientSecret := oidc.ClientSecret.Name != ""
alreadyHasClientSecret := oidc.ClientSecret.SecretKeyRef() != nil
if name != "" && !alreadyHasClientSecret {
key, _, _ := unstructured.NestedString(os, "secretKey")
if key == "" {
key = defaultOIDCClientSecretKey
}
oidc.ClientSecret = corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{Name: name},
Key: key,
}
oidc.ClientSecret = appsv2.ValueFromSecret(name, key, false)
delete(remaining, "secret")
}
}
Expand Down
Loading
Loading