From f7f730a4636c38604595576d9738850f738f2700 Mon Sep 17 00:00:00 2001 From: Harshit Gangal Date: Mon, 6 Nov 2023 18:04:44 +0530 Subject: [PATCH 1/2] update v18 vitess version to vtop main Signed-off-by: Harshit Gangal --- test/endtoend/operator/101_initial_cluster.yaml | 12 ++++++------ test/endtoend/operator/operator.yaml | 4 ++-- test/endtoend/upgrade_test.sh | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/endtoend/operator/101_initial_cluster.yaml b/test/endtoend/operator/101_initial_cluster.yaml index de037be5..469e5e0c 100644 --- a/test/endtoend/operator/101_initial_cluster.yaml +++ b/test/endtoend/operator/101_initial_cluster.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 diff --git a/test/endtoend/operator/operator.yaml b/test/endtoend/operator/operator.yaml index 9bb19200..d2b400fd 100644 --- a/test/endtoend/operator/operator.yaml +++ b/test/endtoend/operator/operator.yaml @@ -6357,7 +6357,7 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: vitess-operator - image: planetscale/vitess-operator:v2.11.0-rc1 + image: planetscale/vitess-operator:v2.11.0 name: vitess-operator resources: limits: @@ -6382,4 +6382,4 @@ globalDefault: false kind: PriorityClass metadata: name: vitess -value: 1000 +value: 1000 \ No newline at end of file diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh index b8054dde..4a94deec 100755 --- a/test/endtoend/upgrade_test.sh +++ b/test/endtoend/upgrade_test.sh @@ -245,7 +245,7 @@ killall kubectl setupKubectlAccessForCI get_started "operator.yaml" "101_initial_cluster.yaml" -verifyVtGateVersion "18.0.0-rc1" +verifyVtGateVersion "18.0.0" checkSemiSyncSetup # Initially too durability policy should be specified verifyDurabilityPolicy "commerce" "semi_sync" From c69a2431456e397b606767e22c9c9023d0d2651a Mon Sep 17 00:00:00 2001 From: Manan Gupta Date: Thu, 4 Jan 2024 15:57:28 +0530 Subject: [PATCH 2/2] feat: update operator latest crd Signed-off-by: Manan Gupta --- test/endtoend/operator/operator-latest.yaml | 215 ++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/test/endtoend/operator/operator-latest.yaml b/test/endtoend/operator/operator-latest.yaml index caa658f7..b687b7d7 100644 --- a/test/endtoend/operator/operator-latest.yaml +++ b/test/endtoend/operator/operator-latest.yaml @@ -2819,6 +2819,45 @@ spec: required: - resources type: object + mysqldExporter: + properties: + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + required: + - resources + type: object + name: + default: "" + type: string replicas: format: int32 minimum: 0 @@ -2876,6 +2915,9 @@ spec: x-kubernetes-int-or-string: true type: object type: object + terminationGracePeriodSeconds: + format: int64 + type: integer required: - resources type: object @@ -2889,6 +2931,7 @@ spec: x-kubernetes-list-map-keys: - type - cell + - name x-kubernetes-list-type: map required: - databaseInitScriptSecret @@ -3214,6 +3257,45 @@ spec: required: - resources type: object + mysqldExporter: + properties: + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + required: + - resources + type: object + name: + default: "" + type: string replicas: format: int32 minimum: 0 @@ -3271,6 +3353,9 @@ spec: x-kubernetes-int-or-string: true type: object type: object + terminationGracePeriodSeconds: + format: int64 + type: integer required: - resources type: object @@ -3284,6 +3369,7 @@ spec: x-kubernetes-list-map-keys: - type - cell + - name x-kubernetes-list-type: map required: - databaseInitScriptSecret @@ -4521,6 +4607,45 @@ spec: required: - resources type: object + mysqldExporter: + properties: + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + required: + - resources + type: object + name: + default: "" + type: string replicas: format: int32 minimum: 0 @@ -4578,6 +4703,9 @@ spec: x-kubernetes-int-or-string: true type: object type: object + terminationGracePeriodSeconds: + format: int64 + type: integer required: - resources type: object @@ -4591,6 +4719,7 @@ spec: x-kubernetes-list-map-keys: - type - cell + - name x-kubernetes-list-type: map required: - databaseInitScriptSecret @@ -4916,6 +5045,45 @@ spec: required: - resources type: object + mysqldExporter: + properties: + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + required: + - resources + type: object + name: + default: "" + type: string replicas: format: int32 minimum: 0 @@ -4973,6 +5141,9 @@ spec: x-kubernetes-int-or-string: true type: object type: object + terminationGracePeriodSeconds: + format: int64 + type: integer required: - resources type: object @@ -4986,6 +5157,7 @@ spec: x-kubernetes-list-map-keys: - type - cell + - name x-kubernetes-list-type: map required: - databaseInitScriptSecret @@ -5853,6 +6025,45 @@ spec: required: - resources type: object + mysqldExporter: + properties: + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + required: + - resources + type: object + name: + default: "" + type: string replicas: format: int32 minimum: 0 @@ -5910,6 +6121,9 @@ spec: x-kubernetes-int-or-string: true type: object type: object + terminationGracePeriodSeconds: + format: int64 + type: integer required: - resources type: object @@ -5923,6 +6137,7 @@ spec: x-kubernetes-list-map-keys: - type - cell + - name x-kubernetes-list-type: map topologyReconciliation: properties: