From ee468886af3241447e218bb014776df3ce14ed0b Mon Sep 17 00:00:00 2001 From: Max Englander Date: Mon, 22 Jan 2024 23:26:56 -0500 Subject: [PATCH 1/4] Add support for user-defined per-keyspace images Signed-off-by: Max Englander Signed-off-by: Florent Poinsard --- .../crds/planetscale.com_vitessclusters.yaml | 22 +++++++++++ docs/api/index.html | 37 +++++++++++++++---- .../planetscale/v2/vitesskeyspace_defaults.go | 20 ++++++++++ .../planetscale/v2/vitesskeyspace_types.go | 18 +++++++-- .../planetscale/v2/zz_generated.deepcopy.go | 1 + .../vitesscluster/reconcile_keyspaces.go | 3 ++ 6 files changed, 89 insertions(+), 12 deletions(-) diff --git a/deploy/crds/planetscale.com_vitessclusters.yaml b/deploy/crds/planetscale.com_vitessclusters.yaml index e1da903a..d58c87cd 100644 --- a/deploy/crds/planetscale.com_vitessclusters.yaml +++ b/deploy/crds/planetscale.com_vitessclusters.yaml @@ -1172,6 +1172,28 @@ spec: type: string durabilityPolicy: type: string + images: + properties: + mysqld: + properties: + mariadb103Compatible: + type: string + mariadbCompatible: + type: string + mysql56Compatible: + type: string + mysql80Compatible: + type: string + type: object + mysqldExporter: + type: string + vtbackup: + type: string + vtorc: + type: string + vttablet: + type: string + type: object name: maxLength: 63 minLength: 1 diff --git a/docs/api/index.html b/docs/api/index.html index 6cce83f3..075eed20 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -4738,10 +4738,11 @@

VitessKeyspace -

Images are not customizable by users at the keyspace level because version -skew across the cluster is discouraged except during rolling updates, -in which case this field is automatically managed by the VitessCluster -controller that owns this VitessKeyspace.

+

Images are inherited from the VitessCluster spec, unless the user has +specified keyspace-level overrides. Version skew across the cluster is +discouraged except during rolling updates, in which case this field is +automatically managed by the VitessCluster controller that owns this +VitessKeyspace.

@@ -5046,6 +5047,7 @@

VitessKeyspaceImages

(Appears on: VitessKeyspaceSpec, +VitessKeyspaceTemplate, VitessShardSpec)

@@ -5525,10 +5527,11 @@

VitessKeyspaceSpec -

Images are not customizable by users at the keyspace level because version -skew across the cluster is discouraged except during rolling updates, -in which case this field is automatically managed by the VitessCluster -controller that owns this VitessKeyspace.

+

Images are inherited from the VitessCluster spec, unless the user has +specified keyspace-level overrides. Version skew across the cluster is +discouraged except during rolling updates, in which case this field is +automatically managed by the VitessCluster controller that owns this +VitessKeyspace.

@@ -5904,6 +5907,24 @@

VitessKeyspaceTemplate

Annotations can optionally be used to attach custom annotations to the VitessKeyspace object.

+ + +images
+ + +VitessKeyspaceImages + + + + +

Users are encouraged to let the VitessCluster controller automatically +propagate image changes from the VitessCluster to the VitessKeyspace +via rolling updates.

+

For special cases, users may specify per-VitessKeyspace images. An +example: migrating from MySQL 5.7 to MySQL 8.0 via a MoveTables +operation, after which the source keyspace is destroyed.

+ +

VitessKeyspaceTurndownPolicy diff --git a/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go b/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go index 81189b87..47cca2cf 100644 --- a/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go +++ b/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go @@ -69,3 +69,23 @@ func DefaultVitessKeyspaceImages(dst *VitessKeyspaceImages, clusterDefaults *Vit dst.MysqldExporter = clusterDefaults.MysqldExporter } } + +// MergeVitessKeyspaceImages takes non-empty image values from a non-nil src +// and sets them on dst. +func MergeVitessKeyspaceImages(dst *VitessKeyspaceImages, src *VitessKeyspaceImages) { + if src.Vttablet != "" { + dst.Vttablet = src.Vttablet + } + if src.Vtorc != "" { + dst.Vtorc = src.Vtorc + } + if src.Vtbackup != "" { + dst.Vtbackup = src.Vtbackup + } + if src.Mysqld != nil { + dst.Mysqld = src.Mysqld + } + if dst.MysqldExporter != "" { + dst.MysqldExporter = src.MysqldExporter + } +} diff --git a/pkg/apis/planetscale/v2/vitesskeyspace_types.go b/pkg/apis/planetscale/v2/vitesskeyspace_types.go index 6f4e0ff1..f631343f 100644 --- a/pkg/apis/planetscale/v2/vitesskeyspace_types.go +++ b/pkg/apis/planetscale/v2/vitesskeyspace_types.go @@ -51,10 +51,11 @@ type VitessKeyspaceSpec struct { // GlobalLockserver are the params to connect to the global lockserver. GlobalLockserver VitessLockserverParams `json:"globalLockserver"` - // Images are not customizable by users at the keyspace level because version - // skew across the cluster is discouraged except during rolling updates, - // in which case this field is automatically managed by the VitessCluster - // controller that owns this VitessKeyspace. + // Images are inherited from the VitessCluster spec, unless the user has + // specified keyspace-level overrides. Version skew across the cluster is + // discouraged except during rolling updates, in which case this field is + // automatically managed by the VitessCluster controller that owns this + // VitessKeyspace. Images VitessKeyspaceImages `json:"images,omitempty"` // ImagePullPolicies are inherited from the VitessCluster spec. @@ -178,6 +179,15 @@ type VitessKeyspaceTemplate struct { // Annotations can optionally be used to attach custom annotations to the VitessKeyspace object. Annotations map[string]string `json:"annotations,omitempty"` + + // Users are encouraged to let the VitessCluster controller automatically + // propagate image changes from the VitessCluster to the VitessKeyspace + // via rolling updates. + // + // For special cases, users may specify per-VitessKeyspace images. An + // example: migrating from MySQL 5.7 to MySQL 8.0 via a `MoveTables` + // operation, after which the source keyspace is destroyed. + Images VitessKeyspaceImages `json:"images,omitempty"` } // VitessOrchestratorSpec specifies deployment parameters for vtorc. diff --git a/pkg/apis/planetscale/v2/zz_generated.deepcopy.go b/pkg/apis/planetscale/v2/zz_generated.deepcopy.go index ff017d72..7fa5578b 100644 --- a/pkg/apis/planetscale/v2/zz_generated.deepcopy.go +++ b/pkg/apis/planetscale/v2/zz_generated.deepcopy.go @@ -1983,6 +1983,7 @@ func (in *VitessKeyspaceTemplate) DeepCopyInto(out *VitessKeyspaceTemplate) { (*out)[key] = val } } + in.Images.DeepCopyInto(&out.Images) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VitessKeyspaceTemplate. diff --git a/pkg/controller/vitesscluster/reconcile_keyspaces.go b/pkg/controller/vitesscluster/reconcile_keyspaces.go index 54ef4784..826d4e8e 100644 --- a/pkg/controller/vitesscluster/reconcile_keyspaces.go +++ b/pkg/controller/vitesscluster/reconcile_keyspaces.go @@ -149,6 +149,9 @@ func newVitessKeyspace(key client.ObjectKey, vt *planetscalev2.VitessCluster, pa images := planetscalev2.VitessKeyspaceImages{} planetscalev2.DefaultVitessKeyspaceImages(&images, &vt.Spec.Images) + // Apply user-defined overrides for images. + planetscalev2.MergeVitessKeyspaceImages(&images, &keyspace.Images) + // Copy parent labels map and add keyspace-specific label. labels := make(map[string]string, len(parentLabels)+1) for k, v := range parentLabels { From 5aa6379d16e6db78e68a90387b8813edb730853b Mon Sep 17 00:00:00 2001 From: Max Englander Date: Tue, 23 Jan 2024 01:44:01 -0500 Subject: [PATCH 2/4] fix mysqld exporter merging Signed-off-by: Max Englander Signed-off-by: Florent Poinsard --- pkg/apis/planetscale/v2/vitesskeyspace_defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go b/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go index 47cca2cf..f659b079 100644 --- a/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go +++ b/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go @@ -85,7 +85,7 @@ func MergeVitessKeyspaceImages(dst *VitessKeyspaceImages, src *VitessKeyspaceIma if src.Mysqld != nil { dst.Mysqld = src.Mysqld } - if dst.MysqldExporter != "" { + if src.MysqldExporter != "" { dst.MysqldExporter = src.MysqldExporter } } From 3766177a1c5c2eca91137a1f63a7e6a3ec41f187 Mon Sep 17 00:00:00 2001 From: Max Englander Date: Wed, 24 Jan 2024 09:25:14 -0500 Subject: [PATCH 3/4] cr: dont propagate mariadb or non-mysqld related images; update comments about version skew Signed-off-by: Max Englander Signed-off-by: Florent Poinsard --- .../crds/planetscale.com_vitessclusters.yaml | 12 --- docs/api/index.html | 100 ++++++++++++++++-- .../planetscale/v2/vitesscluster_types.go | 14 ++- .../planetscale/v2/vitesskeyspace_defaults.go | 19 +--- .../planetscale/v2/vitesskeyspace_types.go | 19 ++-- .../planetscale/v2/zz_generated.deepcopy.go | 35 ++++++ .../vitesscluster/reconcile_keyspaces.go | 2 +- 7 files changed, 155 insertions(+), 46 deletions(-) diff --git a/deploy/crds/planetscale.com_vitessclusters.yaml b/deploy/crds/planetscale.com_vitessclusters.yaml index d58c87cd..9b56e67b 100644 --- a/deploy/crds/planetscale.com_vitessclusters.yaml +++ b/deploy/crds/planetscale.com_vitessclusters.yaml @@ -1176,23 +1176,11 @@ spec: properties: mysqld: properties: - mariadb103Compatible: - type: string - mariadbCompatible: - type: string mysql56Compatible: type: string mysql80Compatible: type: string type: object - mysqldExporter: - type: string - vtbackup: - type: string - vtorc: - type: string - vttablet: - type: string type: object name: maxLength: 63 diff --git a/docs/api/index.html b/docs/api/index.html index 075eed20..809e6e46 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -1418,9 +1418,7 @@

MysqldImage VitessKeyspaceImages)

-

MysqldImage specifies the container image to use for mysqld, -as well as declaring which MySQL flavor setting in Vitess the -image is compatible with.

+

TODO: Remove this once everything is migrated to MysqldImageNew.

@@ -1480,6 +1478,52 @@

MysqldImage

+

MysqldImageNew +

+

+(Appears on: +VitessKeyspaceTemplateImages) +

+

+

MysqldImageNew specifies the container image to use for mysqld, +as well as declaring which MySQL flavor setting in Vitess the +image is compatible with.

+

TODO: rename this to MysqldImage once MysqldImage is removed.

+

+ + + + + + + + + + + + + + + + + +
FieldDescription
+mysql56Compatible
+ +string + +		 +

Mysql56Compatible is a container image (including version tag) for mysqld +that’s compatible with the Vitess “MySQL56” flavor setting.

+
+mysql80Compatible
+ +string + +		 +

Mysql80Compatible is a container image (including version tag) for mysqld +that’s compatible with the Vitess “MySQL80” flavor setting.

+

MysqldSpec

@@ -4742,7 +4786,8 @@

VitessKeyspace specified keyspace-level overrides. Version skew across the cluster is discouraged except during rolling updates, in which case this field is automatically managed by the VitessCluster controller that owns this -VitessKeyspace.

+VitessKeyspace, or else when a user has specified a keyspace-level +images on VitessKeyspaceTemplate.

@@ -5047,7 +5092,6 @@

VitessKeyspaceImages

(Appears on: VitessKeyspaceSpec, -VitessKeyspaceTemplate, VitessShardSpec)

@@ -5531,7 +5575,8 @@

VitessKeyspaceSpec specified keyspace-level overrides. Version skew across the cluster is discouraged except during rolling updates, in which case this field is automatically managed by the VitessCluster controller that owns this -VitessKeyspace.

+VitessKeyspace, or else when a user has specified a keyspace-level +images on VitessKeyspaceTemplate.

@@ -5911,15 +5956,12 @@

VitessKeyspaceTemplate images
- -VitessKeyspaceImages + +VitessKeyspaceTemplateImages -

Users are encouraged to let the VitessCluster controller automatically -propagate image changes from the VitessCluster to the VitessKeyspace -via rolling updates.

For special cases, users may specify per-VitessKeyspace images. An example: migrating from MySQL 5.7 to MySQL 8.0 via a MoveTables operation, after which the source keyspace is destroyed.

@@ -5927,6 +5969,42 @@

VitessKeyspaceTemplate +

VitessKeyspaceTemplateImages +

+

+(Appears on: +VitessKeyspaceTemplate) +

+

+

VitessKeyspaceTemplateImages specifies user-definable container images to +use for this keyspace.

+

+ + + + + + + + + + + + + +
FieldDescription
+mysqld
+ + +MysqldImageNew + + +		 +

Mysqld specifies the container image to use for mysqld, as well as +declaring which MySQL flavor setting in Vitess the image is +compatible with. Only one flavor image may be provided at a time. +mysqld running alongside each tablet.

+

VitessKeyspaceTurndownPolicy (string alias)

diff --git a/pkg/apis/planetscale/v2/vitesscluster_types.go b/pkg/apis/planetscale/v2/vitesscluster_types.go index 8bbac586..f796d11b 100644 --- a/pkg/apis/planetscale/v2/vitesscluster_types.go +++ b/pkg/apis/planetscale/v2/vitesscluster_types.go @@ -244,9 +244,21 @@ type VitessImages struct { MysqldExporter string `json:"mysqldExporter,omitempty"` } -// MysqldImage specifies the container image to use for mysqld, +// MysqldImageNew specifies the container image to use for mysqld, // as well as declaring which MySQL flavor setting in Vitess the // image is compatible with. +// +// TODO: rename this to MysqldImage once MysqldImage is removed. +type MysqldImageNew struct { + // Mysql56Compatible is a container image (including version tag) for mysqld + // that's compatible with the Vitess "MySQL56" flavor setting. + Mysql56Compatible string `json:"mysql56Compatible,omitempty"` + // Mysql80Compatible is a container image (including version tag) for mysqld + // that's compatible with the Vitess "MySQL80" flavor setting. + Mysql80Compatible string `json:"mysql80Compatible,omitempty"` +} + +// TODO: Remove this once everything is migrated to MysqldImageNew. type MysqldImage struct { // Mysql56Compatible is a container image (including version tag) for mysqld // that's compatible with the Vitess "MySQL56" flavor setting. diff --git a/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go b/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go index f659b079..aa5c51d2 100644 --- a/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go +++ b/pkg/apis/planetscale/v2/vitesskeyspace_defaults.go @@ -70,22 +70,11 @@ func DefaultVitessKeyspaceImages(dst *VitessKeyspaceImages, clusterDefaults *Vit } } -// MergeVitessKeyspaceImages takes non-empty image values from a non-nil src +// MergeVitessKeyspaceTemplateImages takes non-empty image values from a non-nil src // and sets them on dst. -func MergeVitessKeyspaceImages(dst *VitessKeyspaceImages, src *VitessKeyspaceImages) { - if src.Vttablet != "" { - dst.Vttablet = src.Vttablet - } - if src.Vtorc != "" { - dst.Vtorc = src.Vtorc - } - if src.Vtbackup != "" { - dst.Vtbackup = src.Vtbackup - } +func MergeVitessKeyspaceTemplateImages(dst *VitessKeyspaceImages, src *VitessKeyspaceTemplateImages) { if src.Mysqld != nil { - dst.Mysqld = src.Mysqld - } - if src.MysqldExporter != "" { - dst.MysqldExporter = src.MysqldExporter + dst.Mysqld.Mysql56Compatible = src.Mysqld.Mysql56Compatible + dst.Mysqld.Mysql80Compatible = src.Mysqld.Mysql80Compatible } } diff --git a/pkg/apis/planetscale/v2/vitesskeyspace_types.go b/pkg/apis/planetscale/v2/vitesskeyspace_types.go index f631343f..1550b242 100644 --- a/pkg/apis/planetscale/v2/vitesskeyspace_types.go +++ b/pkg/apis/planetscale/v2/vitesskeyspace_types.go @@ -55,7 +55,8 @@ type VitessKeyspaceSpec struct { // specified keyspace-level overrides. Version skew across the cluster is // discouraged except during rolling updates, in which case this field is // automatically managed by the VitessCluster controller that owns this - // VitessKeyspace. + // VitessKeyspace, or else when a user has specified a keyspace-level + // images on VitessKeyspaceTemplate. Images VitessKeyspaceImages `json:"images,omitempty"` // ImagePullPolicies are inherited from the VitessCluster spec. @@ -180,14 +181,20 @@ type VitessKeyspaceTemplate struct { // Annotations can optionally be used to attach custom annotations to the VitessKeyspace object. Annotations map[string]string `json:"annotations,omitempty"` - // Users are encouraged to let the VitessCluster controller automatically - // propagate image changes from the VitessCluster to the VitessKeyspace - // via rolling updates. - // // For special cases, users may specify per-VitessKeyspace images. An // example: migrating from MySQL 5.7 to MySQL 8.0 via a `MoveTables` // operation, after which the source keyspace is destroyed. - Images VitessKeyspaceImages `json:"images,omitempty"` + Images VitessKeyspaceTemplateImages `json:"images,omitempty"` +} + +// VitessKeyspaceTemplateImages specifies user-definable container images to +// use for this keyspace. +type VitessKeyspaceTemplateImages struct { + // Mysqld specifies the container image to use for mysqld, as well as + // declaring which MySQL flavor setting in Vitess the image is + // compatible with. Only one flavor image may be provided at a time. + // mysqld running alongside each tablet. + Mysqld *MysqldImageNew `json:"mysqld,omitempty"` } // VitessOrchestratorSpec specifies deployment parameters for vtorc. diff --git a/pkg/apis/planetscale/v2/zz_generated.deepcopy.go b/pkg/apis/planetscale/v2/zz_generated.deepcopy.go index 7fa5578b..426ab67b 100644 --- a/pkg/apis/planetscale/v2/zz_generated.deepcopy.go +++ b/pkg/apis/planetscale/v2/zz_generated.deepcopy.go @@ -405,6 +405,21 @@ func (in *MysqldImage) DeepCopy() *MysqldImage { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *MysqldImageNew) DeepCopyInto(out *MysqldImageNew) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MysqldImageNew. +func (in *MysqldImageNew) DeepCopy() *MysqldImageNew { + if in == nil { + return nil + } + out := new(MysqldImageNew) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MysqldSpec) DeepCopyInto(out *MysqldSpec) { *out = *in @@ -1996,6 +2011,26 @@ func (in *VitessKeyspaceTemplate) DeepCopy() *VitessKeyspaceTemplate { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *VitessKeyspaceTemplateImages) DeepCopyInto(out *VitessKeyspaceTemplateImages) { + *out = *in + if in.Mysqld != nil { + in, out := &in.Mysqld, &out.Mysqld + *out = new(MysqldImageNew) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VitessKeyspaceTemplateImages. +func (in *VitessKeyspaceTemplateImages) DeepCopy() *VitessKeyspaceTemplateImages { + if in == nil { + return nil + } + out := new(VitessKeyspaceTemplateImages) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *VitessLockserverParams) DeepCopyInto(out *VitessLockserverParams) { *out = *in diff --git a/pkg/controller/vitesscluster/reconcile_keyspaces.go b/pkg/controller/vitesscluster/reconcile_keyspaces.go index 826d4e8e..25136491 100644 --- a/pkg/controller/vitesscluster/reconcile_keyspaces.go +++ b/pkg/controller/vitesscluster/reconcile_keyspaces.go @@ -150,7 +150,7 @@ func newVitessKeyspace(key client.ObjectKey, vt *planetscalev2.VitessCluster, pa planetscalev2.DefaultVitessKeyspaceImages(&images, &vt.Spec.Images) // Apply user-defined overrides for images. - planetscalev2.MergeVitessKeyspaceImages(&images, &keyspace.Images) + planetscalev2.MergeVitessKeyspaceTemplateImages(&images, &keyspace.Images) // Copy parent labels map and add keyspace-specific label. labels := make(map[string]string, len(parentLabels)+1) From f6ffa05b953ce561437d7e30bf8c3ecc49be4d8b Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 8 Oct 2024 14:58:23 -0600 Subject: [PATCH 4/4] Re-generate the operator-latest.yaml Signed-off-by: Florent Poinsard --- test/endtoend/operator/operator-latest.yaml | 43 +++++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/test/endtoend/operator/operator-latest.yaml b/test/endtoend/operator/operator-latest.yaml index caa658f7..847cc8b5 100644 --- a/test/endtoend/operator/operator-latest.yaml +++ b/test/endtoend/operator/operator-latest.yaml @@ -1,4 +1,3 @@ ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -2490,6 +2489,16 @@ spec: type: string durabilityPolicy: type: string + images: + properties: + mysqld: + properties: + mysql56Compatible: + type: string + mysql80Compatible: + type: string + type: object + type: object name: maxLength: 63 minLength: 1 @@ -6318,6 +6327,22 @@ subjects: - kind: ServiceAccount name: vitess-operator --- +apiVersion: scheduling.k8s.io/v1 +description: Vitess components (vttablet, vtgate, vtctld, etcd) +globalDefault: false +kind: PriorityClass +metadata: + name: vitess +value: 1000 +--- +apiVersion: scheduling.k8s.io/v1 +description: The vitess-operator control plane. +globalDefault: false +kind: PriorityClass +metadata: + name: vitess-operator-control-plane +value: 5000 +--- apiVersion: apps/v1 kind: Deployment metadata: @@ -6368,19 +6393,3 @@ spec: memory: 128Mi priorityClassName: vitess-operator-control-plane serviceAccountName: vitess-operator ---- -apiVersion: scheduling.k8s.io/v1 -description: The vitess-operator control plane. -globalDefault: false -kind: PriorityClass -metadata: - name: vitess-operator-control-plane -value: 5000 ---- -apiVersion: scheduling.k8s.io/v1 -description: Vitess components (vttablet, vtgate, vtctld, etcd) -globalDefault: false -kind: PriorityClass -metadata: - name: vitess -value: 1000