From c484c1d374edd888d136f470fb92fa7cdd6fadae Mon Sep 17 00:00:00 2001 From: Harshit Gangal Date: Mon, 6 Nov 2023 17:51:29 +0530 Subject: [PATCH 1/4] update vitess version to v18 Signed-off-by: Harshit Gangal --- go.mod | 15 ++++++++------- go.sum | 30 ++++++++++++++++-------------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 398759a3..d227c4c1 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( sigs.k8s.io/controller-runtime v0.14.3 sigs.k8s.io/controller-tools v0.11.3 sigs.k8s.io/kustomize v2.0.3+incompatible - vitess.io/vitess v0.18.0-rc1 + vitess.io/vitess v0.18.0 ) require ( @@ -49,7 +49,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect - github.com/cyphar/filepath-securejoin v0.2.3 // indirect + github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/dustin/go-humanize v1.0.1 // indirect @@ -148,14 +148,15 @@ require ( go.uber.org/zap v1.24.0 // indirect go4.org/intern v0.0.0-20230205224052-192e9f60865c // indirect go4.org/unsafe/assume-no-moving-gc v0.0.0-20230426161633-7e06285ff160 // indirect - golang.org/x/crypto v0.12.0 // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.14.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/term v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect diff --git a/go.sum b/go.sum index fc3e5b26..9cf01838 100644 --- a/go.sum +++ b/go.sum @@ -152,8 +152,8 @@ github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -698,8 +698,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -710,6 +710,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -790,8 +792,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -889,14 +891,14 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -909,8 +911,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1182,5 +1184,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= -vitess.io/vitess v0.18.0-rc1 h1:jbAChyR1nOnSZR+ZjEBTQ8+75+N5NLdynL1n1ZpHQJs= -vitess.io/vitess v0.18.0-rc1/go.mod h1:Ti+Dsc4N16nF+xLRaguMzQ77jgFOVa1JHE5smOg2pGA= +vitess.io/vitess v0.18.0 h1:C1cSYQsUtnhChMWBNC0NSePZUKnYt9bdHLXAlQ/9SWQ= +vitess.io/vitess v0.18.0/go.mod h1:jpoICmsNS2b8ljTWoGDCuXS7lUpzjmn1XmJSucvPXuQ= From 8344d5e3dba3d2a7fbb4a7aa8ac0d5cde50305d0 Mon Sep 17 00:00:00 2001 From: Harshit Gangal Date: Mon, 6 Nov 2023 17:51:34 +0530 Subject: [PATCH 2/4] Release commit for 2.11.0 Signed-off-by: Harshit Gangal --- pkg/apis/planetscale/v2/defaults.go | 2 +- .../operator/101_initial_cluster_backup.yaml | 12 ++++++------ .../101_initial_cluster_vtorc_vtadmin.yaml | 14 +++++++------- test/endtoend/operator/102_keyspace_teardown.yaml | 12 ++++++------ test/endtoend/operator/201_customer_tablets.yaml | 12 ++++++------ test/endtoend/operator/302_new_shards.yaml | 12 ++++++------ test/endtoend/operator/306_down_shard_0.yaml | 12 ++++++------ test/endtoend/operator/cluster_upgrade.yaml | 12 ++++++------ 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pkg/apis/planetscale/v2/defaults.go b/pkg/apis/planetscale/v2/defaults.go index 29feb328..7d67b570 100644 --- a/pkg/apis/planetscale/v2/defaults.go +++ b/pkg/apis/planetscale/v2/defaults.go @@ -102,7 +102,7 @@ const ( // DefaultMysqlPortName is the name for the MySQL port. DefaultMysqlPortName = "mysql" - defaultVitessLiteImage = "vitess/lite:v18.0.0-rc1" + defaultVitessLiteImage = "vitess/lite:v18.0.0" DefaultInitCPURequestMillis = 100 DefaultInitMemoryRequestBytes = 32 * (1 << 20) // 32 MiB diff --git a/test/endtoend/operator/101_initial_cluster_backup.yaml b/test/endtoend/operator/101_initial_cluster_backup.yaml index ec74a18d..7cd60db6 100644 --- a/test/endtoend/operator/101_initial_cluster_backup.yaml +++ b/test/endtoend/operator/101_initial_cluster_backup.yaml @@ -15,13 +15,13 @@ spec: path: /backup type: Directory images: - vtctld: vitess/lite:v18.0.0-rc1 - vtgate: vitess/lite:v18.0.0-rc1 - vttablet: vitess/lite:v18.0.0-rc1 - vtorc: vitess/lite:v18.0.0-rc1 - vtbackup: vitess/lite:v18.0.0-rc1 + vtctld: vitess/lite:v18.0.0 + vtgate: vitess/lite:v18.0.0 + vttablet: vitess/lite:v18.0.0 + vtorc: vitess/lite:v18.0.0 + vtbackup: vitess/lite:v18.0.0 mysqld: - mysql56Compatible: vitess/lite:v18.0.0-rc1 + mysql56Compatible: vitess/lite:v18.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml b/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml index 699e8927..50859181 100644 --- a/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml +++ b/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v18.0.0-rc1 - vtadmin: vitess/vtadmin:v18.0.0-rc1 - vtgate: vitess/lite:v18.0.0-rc1 - vttablet: vitess/lite:v18.0.0-rc1 - vtbackup: vitess/lite:v18.0.0-rc1 - vtorc: vitess/lite:v18.0.0-rc1 + vtctld: vitess/lite:v18.0.0 + vtadmin: vitess/vtadmin:v18.0.0 + vtgate: vitess/lite:v18.0.0 + vttablet: vitess/lite:v18.0.0 + vtbackup: vitess/lite:v18.0.0 + vtorc: vitess/lite:v18.0.0 mysqld: - mysql80Compatible: vitess/lite:v18.0.0-rc1 + mysql80Compatible: vitess/lite:v18.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/102_keyspace_teardown.yaml b/test/endtoend/operator/102_keyspace_teardown.yaml index 1aea5ee6..0f1767b4 100644 --- a/test/endtoend/operator/102_keyspace_teardown.yaml +++ b/test/endtoend/operator/102_keyspace_teardown.yaml @@ -15,13 +15,13 @@ spec: path: /backup type: Directory images: - vtctld: vitess/lite:v18.0.0-rc1 - vtgate: vitess/lite:v18.0.0-rc1 - vttablet: vitess/lite:v18.0.0-rc1 - vtorc: vitess/lite:v18.0.0-rc1 - vtbackup: vitess/lite:v18.0.0-rc1 + vtctld: vitess/lite:v18.0.0 + vtgate: vitess/lite:v18.0.0 + vttablet: vitess/lite:v18.0.0 + vtorc: vitess/lite:v18.0.0 + vtbackup: vitess/lite:v18.0.0 mysqld: - mysql56Compatible: vitess/lite:v18.0.0-rc1 + mysql56Compatible: vitess/lite:v18.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/201_customer_tablets.yaml b/test/endtoend/operator/201_customer_tablets.yaml index a8558ac3..c82328b5 100644 --- a/test/endtoend/operator/201_customer_tablets.yaml +++ b/test/endtoend/operator/201_customer_tablets.yaml @@ -4,13 +4,13 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v18.0.0-rc1 - vtgate: vitess/lite:v18.0.0-rc1 - vttablet: vitess/lite:v18.0.0-rc1 - vtorc: vitess/lite:v18.0.0-rc1 - vtbackup: vitess/lite:v18.0.0-rc1 + vtctld: vitess/lite:v18.0.0 + vtgate: vitess/lite:v18.0.0 + vttablet: vitess/lite:v18.0.0 + vtorc: vitess/lite:v18.0.0 + vtbackup: vitess/lite:v18.0.0 mysqld: - mysql80Compatible: vitess/lite:v18.0.0-rc1 + mysql80Compatible: vitess/lite:v18.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/302_new_shards.yaml b/test/endtoend/operator/302_new_shards.yaml index 113c73e6..f959f27d 100644 --- a/test/endtoend/operator/302_new_shards.yaml +++ b/test/endtoend/operator/302_new_shards.yaml @@ -4,13 +4,13 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v18.0.0-rc1 - vtgate: vitess/lite:v18.0.0-rc1 - vttablet: vitess/lite:v18.0.0-rc1 - vtorc: vitess/lite:v18.0.0-rc1 - vtbackup: vitess/lite:v18.0.0-rc1 + vtctld: vitess/lite:v18.0.0 + vtgate: vitess/lite:v18.0.0 + vttablet: vitess/lite:v18.0.0 + vtorc: vitess/lite:v18.0.0 + vtbackup: vitess/lite:v18.0.0 mysqld: - mysql80Compatible: vitess/lite:v18.0.0-rc1 + mysql80Compatible: vitess/lite:v18.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/306_down_shard_0.yaml b/test/endtoend/operator/306_down_shard_0.yaml index 8375ae22..749b89b6 100644 --- a/test/endtoend/operator/306_down_shard_0.yaml +++ b/test/endtoend/operator/306_down_shard_0.yaml @@ -4,13 +4,13 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v18.0.0-rc1 - vtgate: vitess/lite:v18.0.0-rc1 - vttablet: vitess/lite:v18.0.0-rc1 - vtorc: vitess/lite:v18.0.0-rc1 - vtbackup: vitess/lite:v18.0.0-rc1 + vtctld: vitess/lite:v18.0.0 + vtgate: vitess/lite:v18.0.0 + vttablet: vitess/lite:v18.0.0 + vtorc: vitess/lite:v18.0.0 + vtbackup: vitess/lite:v18.0.0 mysqld: - mysql80Compatible: vitess/lite:v18.0.0-rc1 + mysql80Compatible: vitess/lite:v18.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/cluster_upgrade.yaml b/test/endtoend/operator/cluster_upgrade.yaml index 455a61d3..86259c7d 100644 --- a/test/endtoend/operator/cluster_upgrade.yaml +++ b/test/endtoend/operator/cluster_upgrade.yaml @@ -8,13 +8,13 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v18.0.0-rc1 - vtgate: vitess/lite:v18.0.0-rc1 - vttablet: vitess/lite:v18.0.0-rc1 - vtorc: vitess/lite:v18.0.0-rc1 - vtbackup: vitess/lite:v18.0.0-rc1 + vtctld: vitess/lite:v18.0.0 + vtgate: vitess/lite:v18.0.0 + vttablet: vitess/lite:v18.0.0 + vtorc: vitess/lite:v18.0.0 + vtbackup: vitess/lite:v18.0.0 mysqld: - mysql80Compatible: vitess/lite:v18.0.0-rc1 + mysql80Compatible: vitess/lite:v18.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 From 4742c446376dbca7720bf9ccb5eefd33a4621291 Mon Sep 17 00:00:00 2001 From: Harshit Gangal Date: Mon, 6 Nov 2023 18:13:16 +0530 Subject: [PATCH 3/4] back to dev mode Signed-off-by: Harshit Gangal --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index c17e6779..31dfdd49 100644 --- a/version/version.go +++ b/version/version.go @@ -17,5 +17,5 @@ limitations under the License. package version var ( - Version = "2.11.0" + Version = "2.11.1" ) From 8043fbe936450fd0c92cba248acb04b015e11c8a Mon Sep 17 00:00:00 2001 From: Manan Gupta Date: Tue, 7 Nov 2023 15:09:18 +0530 Subject: [PATCH 4/4] feat: fix test expectations Signed-off-by: Manan Gupta --- test/endtoend/backup_restore_test.sh | 2 +- test/endtoend/upgrade_test.sh | 2 +- test/endtoend/vtorc_vtadmin_test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/endtoend/backup_restore_test.sh b/test/endtoend/backup_restore_test.sh index 8cf72e21..2ffe437a 100755 --- a/test/endtoend/backup_restore_test.sh +++ b/test/endtoend/backup_restore_test.sh @@ -103,7 +103,7 @@ killall kubectl setupKubectlAccessForCI get_started "operator-latest.yaml" "101_initial_cluster_backup.yaml" -verifyVtGateVersion "18.0.0-rc1" +verifyVtGateVersion "18.0.0" checkSemiSyncSetup takeBackup "commerce/-" verifyListBackupsOutput diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh index 3b51f29c..d15a4256 100755 --- a/test/endtoend/upgrade_test.sh +++ b/test/endtoend/upgrade_test.sh @@ -250,7 +250,7 @@ checkSemiSyncSetup # Initially too durability policy should be specified verifyDurabilityPolicy "commerce" "semi_sync" upgradeToLatest -verifyVtGateVersion "18.0.0-rc1" +verifyVtGateVersion "18.0.0" checkSemiSyncSetup # After upgrading, we verify that the durability policy is still semi_sync verifyDurabilityPolicy "commerce" "semi_sync" diff --git a/test/endtoend/vtorc_vtadmin_test.sh b/test/endtoend/vtorc_vtadmin_test.sh index afff30fe..944bdfcd 100755 --- a/test/endtoend/vtorc_vtadmin_test.sh +++ b/test/endtoend/vtorc_vtadmin_test.sh @@ -242,7 +242,7 @@ killall kubectl setupKubectlAccessForCI get_started_vtorc_vtadmin -verifyVtGateVersion "18.0.0-rc1" +verifyVtGateVersion "18.0.0" checkSemiSyncSetup # Check Vtadmin is setup