Skip to content

fix overwrite of cluster-level default images #713

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

fix overwrite of cluster-level default images #713

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c13596
fix overwrite of cluster-level default image
frouioui Jul 30, 2025
0f157c3
fix comment
frouioui Jul 30, 2025
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
14 changes: 9 additions & 5 deletions pkg/apis/planetscale/v2/vitesskeyspace_defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,24 @@ func DefaultVitessOrchestrator(vtorc **VitessOrchestratorSpec) {
// DefaultVitessKeyspaceImages fills in unspecified keyspace-level images from cluster-level defaults.
// The clusterDefaults should have already had its unspecified fields filled in with operator defaults.
func DefaultVitessKeyspaceImages(dst *VitessKeyspaceImages, clusterDefaults *VitessImages) {
// Deep copying the cluster-level defaults to prevent
// overwriting any value for subsequent keyspaces.
defaults := clusterDefaults.DeepCopy()

if dst.Vttablet == "" {
dst.Vttablet = clusterDefaults.Vttablet
dst.Vttablet = defaults.Vttablet
}
if dst.Vtorc == "" {
dst.Vtorc = clusterDefaults.Vtorc
dst.Vtorc = defaults.Vtorc
}
if dst.Vtbackup == "" {
dst.Vtbackup = clusterDefaults.Vtbackup
dst.Vtbackup = defaults.Vtbackup
}
if dst.Mysqld == nil {
dst.Mysqld = clusterDefaults.Mysqld
dst.Mysqld = defaults.Mysqld
}
if dst.MysqldExporter == "" {
dst.MysqldExporter = clusterDefaults.MysqldExporter
dst.MysqldExporter = defaults.MysqldExporter
}
}

Expand Down