diff --git a/test/endtoend/operator/101_initial_cluster.yaml b/test/endtoend/operator/101_initial_cluster.yaml index 16a73ee4..6b081eea 100644 --- a/test/endtoend/operator/101_initial_cluster.yaml +++ b/test/endtoend/operator/101_initial_cluster.yaml @@ -15,13 +15,13 @@ spec: persistentVolumeClaim: claimName: vitess-backups images: - vtctld: vitess/lite:v22.0.1 - vtgate: vitess/lite:v22.0.1 - vttablet: vitess/lite:v22.0.1 - vtorc: vitess/lite:v22.0.1 - vtbackup: vitess/lite:v22.0.1 + vtctld: vitess/lite:v23.0.0-rc2-mysql80 + vtgate: vitess/lite:v23.0.0-rc2-mysql80 + vttablet: vitess/lite:v23.0.0-rc2-mysql80 + vtorc: vitess/lite:v23.0.0-rc2-mysql80 + vtbackup: vitess/lite:v23.0.0-rc2-mysql80 mysqld: - mysql80Compatible: vitess/lite:v22.0.1 + mysql80Compatible: vitess/lite:v23.0.0-rc2-mysql80 mysqldExporter: prom/mysqld-exporter:v0.14.0 cells: - name: zone1 diff --git a/test/endtoend/operator/operator.yaml b/test/endtoend/operator/operator.yaml index d6ac8b9c..8eba1192 100644 --- a/test/endtoend/operator/operator.yaml +++ b/test/endtoend/operator/operator.yaml @@ -3894,6 +3894,10 @@ spec: type: object mysqldExporter: properties: + extraFlags: + additionalProperties: + type: string + type: object resources: properties: claims: @@ -3927,8 +3931,6 @@ spec: x-kubernetes-int-or-string: true type: object type: object - required: - - resources type: object name: default: "" @@ -4020,6 +4022,12 @@ spec: type: object equal: properties: + hexWidth: + default: 0 + format: int32 + maximum: 65536 + minimum: 0 + type: integer parts: format: int32 maximum: 65536 @@ -4335,6 +4343,10 @@ spec: type: object mysqldExporter: properties: + extraFlags: + additionalProperties: + type: string + type: object resources: properties: claims: @@ -4368,8 +4380,6 @@ spec: x-kubernetes-int-or-string: true type: object type: object - required: - - resources type: object name: default: "" @@ -4455,6 +4465,7 @@ spec: - databaseInitScriptSecret type: object required: + - hexWidth - parts type: object type: object @@ -4980,6 +4991,8 @@ spec: type: array extraVolumes: x-kubernetes-preserve-unknown-fields: true + fetchCredentials: + type: string initContainers: x-kubernetes-preserve-unknown-fields: true rbac: @@ -5713,6 +5726,10 @@ spec: type: object mysqldExporter: properties: + extraFlags: + additionalProperties: + type: string + type: object resources: properties: claims: @@ -5746,8 +5763,6 @@ spec: x-kubernetes-int-or-string: true type: object type: object - required: - - resources type: object name: default: "" @@ -5839,6 +5854,12 @@ spec: type: object equal: properties: + hexWidth: + default: 0 + format: int32 + maximum: 65536 + minimum: 0 + type: integer parts: format: int32 maximum: 65536 @@ -6154,6 +6175,10 @@ spec: type: object mysqldExporter: properties: + extraFlags: + additionalProperties: + type: string + type: object resources: properties: claims: @@ -6187,8 +6212,6 @@ spec: x-kubernetes-int-or-string: true type: object type: object - required: - - resources type: object name: default: "" @@ -6274,6 +6297,7 @@ spec: - databaseInitScriptSecret type: object required: + - hexWidth - parts type: object type: object @@ -7148,6 +7172,10 @@ spec: type: object mysqldExporter: properties: + extraFlags: + additionalProperties: + type: string + type: object resources: properties: claims: @@ -7181,8 +7209,6 @@ spec: x-kubernetes-int-or-string: true type: object type: object - required: - - resources type: object name: default: "" @@ -7774,7 +7800,7 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: vitess-operator - image: planetscale/vitess-operator:v2.15.1 + image: planetscale/vitess-operator:v2.16.0-rc1 name: vitess-operator resources: limits: @@ -7788,4 +7814,4 @@ spec: # It is inherited by the backup subcontroller and allows it to access # the files created by Vitess on the shared persistent volume. fsGroup: 999 # Default fsGroup of Vitess - serviceAccountName: vitess-operator + serviceAccountName: vitess-operator \ No newline at end of file diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh index 62602abb..237f6de0 100755 --- a/test/endtoend/upgrade_test.sh +++ b/test/endtoend/upgrade_test.sh @@ -266,7 +266,7 @@ setupKindCluster cd test/endtoend/operator || exit 1 get_started "operator.yaml" "101_initial_cluster.yaml" -verifyVtGateVersion "22.0.1" +verifyVtGateVersion "23.0.0-rc2" checkSemiSyncSetup # Initially too durability policy should be specified verifyDurabilityPolicy "commerce" "semi_sync"