Skip to content
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

Export Defaulting Code for Update Strategy #86

Merged
merged 1 commit into from
May 7, 2020
Merged

Export Defaulting Code for Update Strategy #86

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
4 changes: 2 additions & 2 deletions pkg/apis/planetscale/v2/vitesscluster_defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func DefaultVitessCluster(vt *VitessCluster) {
DefaultVitessKeyspaceTemplates(vt.Spec.Keyspaces)
defaultClusterBackup(vt.Spec.Backup)
DefaultTopoReconcileConfig(&vt.Spec.TopologyReconciliation)
defaultUpdateStrategy(&vt.Spec.UpdateStrategy)
DefaultUpdateStrategy(&vt.Spec.UpdateStrategy)
}

func defaultGlobalLockserver(vt *VitessCluster) {
Expand Down Expand Up @@ -170,7 +170,7 @@ func DefaultTopoReconcileConfig(confPtr **TopoReconcileConfig) {
}
}

func defaultUpdateStrategy(updateStratPtr **VitessClusterUpdateStrategy) {
func DefaultUpdateStrategy(updateStratPtr **VitessClusterUpdateStrategy) {
if *updateStratPtr == nil {
*updateStratPtr = &VitessClusterUpdateStrategy{}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/planetscale/v2/vitesskeyspace_defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package v2
// might not be safe to deref.
func DefaultVitessKeyspace(dst *VitessKeyspace) {
DefaultTopoReconcileConfig(&dst.Spec.TopologyReconciliation)
defaultUpdateStrategy(&dst.Spec.UpdateStrategy)
DefaultUpdateStrategy(&dst.Spec.UpdateStrategy)
}

// DefaultVitessKeyspaceImages fills in unspecified keyspace-level images from cluster-level defaults.
Expand Down