From 3b4fd3bd9d88f2000422a7e48b82099d41238e0a Mon Sep 17 00:00:00 2001 From: Pavel Tankov <4014969+ptankov@users.noreply.github.com> Date: Wed, 21 Aug 2024 17:53:06 +0300 Subject: [PATCH 1/2] K8SPXC-1363 Update container image versions back to main and add a section in the upgrade-consistency test for 1.16.0 --- deploy/bundle.yaml | 2 +- deploy/cr-minimal.yaml | 8 ++-- deploy/cr.yaml | 16 +++---- deploy/cw-bundle.yaml | 2 +- deploy/cw-operator.yaml | 2 +- deploy/operator.yaml | 2 +- ...ml => service_some-name-proxysql-1160.yml} | 0 ...130.yml => service_some-name-pxc-1160.yml} | 0 ...atefulset_some-name-proxysql-1140-k127.yml | 2 +- ...atefulset_some-name-proxysql-1150-k127.yml | 2 +- ...ulset_some-name-proxysql-1160-k127-oc.yml} | 48 ++++++++++++++----- ...tefulset_some-name-proxysql-1160-k127.yml} | 48 ++++++++++++++----- ...tatefulset_some-name-proxysql-1160-oc.yml} | 48 ++++++++++++++----- ...> statefulset_some-name-proxysql-1160.yml} | 35 ++++++++------ .../statefulset_some-name-pxc-1140-k127.yml | 2 +- .../statefulset_some-name-pxc-1150-k127.yml | 2 +- ...tatefulset_some-name-pxc-1160-k127-oc.yml} | 16 ++++--- ...> statefulset_some-name-pxc-1160-k127.yml} | 16 ++++--- ... => statefulset_some-name-pxc-1160-oc.yml} | 16 ++++--- ...yml => statefulset_some-name-pxc-1160.yml} | 16 ++++--- e2e-tests/upgrade-consistency/run | 30 ++++++------ version/version.go | 2 +- 22 files changed, 207 insertions(+), 108 deletions(-) rename e2e-tests/upgrade-consistency/compare/{service_some-name-proxysql-1130.yml => service_some-name-proxysql-1160.yml} (100%) rename e2e-tests/upgrade-consistency/compare/{service_some-name-pxc-1130.yml => service_some-name-pxc-1160.yml} (100%) rename e2e-tests/upgrade-consistency/compare/{statefulset_some-name-proxysql-1130-k127-oc.yml => statefulset_some-name-proxysql-1160-k127-oc.yml} (85%) rename e2e-tests/upgrade-consistency/compare/{statefulset_some-name-proxysql-1130-k127.yml => statefulset_some-name-proxysql-1160-k127.yml} (85%) rename e2e-tests/upgrade-consistency/compare/{statefulset_some-name-proxysql-1130-oc.yml => statefulset_some-name-proxysql-1160-oc.yml} (84%) rename e2e-tests/upgrade-consistency/compare/{statefulset_some-name-proxysql-1130.yml => statefulset_some-name-proxysql-1160.yml} (91%) rename e2e-tests/upgrade-consistency/compare/{statefulset_some-name-pxc-1130-k127-oc.yml => statefulset_some-name-pxc-1160-k127-oc.yml} (96%) rename e2e-tests/upgrade-consistency/compare/{statefulset_some-name-pxc-1130-k127.yml => statefulset_some-name-pxc-1160-k127.yml} (96%) rename e2e-tests/upgrade-consistency/compare/{statefulset_some-name-pxc-1130-oc.yml => statefulset_some-name-pxc-1160-oc.yml} (96%) rename e2e-tests/upgrade-consistency/compare/{statefulset_some-name-pxc-1130.yml => statefulset_some-name-pxc-1160.yml} (96%) diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index a5c443b865..39893440ec 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -11308,7 +11308,7 @@ spec: value: percona-xtradb-cluster-operator - name: DISABLE_TELEMETRY value: "false" - image: percona/percona-xtradb-cluster-operator:1.15.0 + image: perconalab/percona-xtradb-cluster-operator:main imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/cr-minimal.yaml b/deploy/cr-minimal.yaml index 61341bf350..26fccfbac3 100644 --- a/deploy/cr-minimal.yaml +++ b/deploy/cr-minimal.yaml @@ -3,7 +3,7 @@ kind: PerconaXtraDBCluster metadata: name: minimal-cluster spec: - crVersion: 1.15.0 + crVersion: 1.16.0 secretsName: minimal-cluster-secrets unsafeFlags: tls: true @@ -16,7 +16,7 @@ spec: enabled: false pxc: size: 1 - image: percona/percona-xtradb-cluster:8.0.36-28.1 + image: perconalab/percona-xtradb-cluster-operator:main-pxc8.0 volumeSpec: persistentVolumeClaim: resources: @@ -25,7 +25,7 @@ spec: haproxy: enabled: true size: 1 - image: percona/haproxy:2.8.5 + image: perconalab/percona-xtradb-cluster-operator:main-haproxy logcollector: enabled: true - image: percona/percona-xtradb-cluster-operator:1.15.0-logcollector-fluentbit3.1.4 + image: perconalab/percona-xtradb-cluster-operator:main-logcollector diff --git a/deploy/cr.yaml b/deploy/cr.yaml index bcf6fe4488..0c42eb6bcb 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -10,7 +10,7 @@ metadata: # annotations: # percona.com/issue-vault-token: "true" spec: - crVersion: 1.15.0 + crVersion: 1.16.0 # ignoreAnnotations: # - iam.amazonaws.com/role # ignoreLabels: @@ -21,7 +21,7 @@ spec: # sslInternalSecretName: cluster1-ssl-internal # logCollectorSecretName: cluster1-log-collector-secrets # initContainer: -# image: percona/percona-xtradb-cluster-operator:1.15.0 +# image: perconalab/percona-xtradb-cluster-operator:main # resources: # requests: # memory: 100M @@ -53,7 +53,7 @@ spec: schedule: "0 4 * * *" pxc: size: 3 - image: percona/percona-xtradb-cluster:8.0.36-28.1 + image: perconalab/percona-xtradb-cluster-operator:main-pxc8.0 autoRecovery: true # expose: # enabled: true @@ -201,7 +201,7 @@ spec: haproxy: enabled: true size: 3 - image: percona/haproxy:2.8.5 + image: perconalab/percona-xtradb-cluster-operator:main-haproxy # imagePullPolicy: Always # schedulerName: mycustom-scheduler # readinessDelaySec: 15 @@ -376,7 +376,7 @@ spec: proxysql: enabled: false size: 3 - image: percona/proxysql2:2.5.5 + image: perconalab/percona-xtradb-cluster-operator:main-proxysql # imagePullPolicy: Always # configuration: | # datadir="/var/lib/proxysql" @@ -538,7 +538,7 @@ spec: # - 10.0.0.0/8 logcollector: enabled: true - image: percona/percona-xtradb-cluster-operator:1.15.0-logcollector-fluentbit3.1.4 + image: perconalab/percona-xtradb-cluster-operator:main-logcollector # configuration: | # [OUTPUT] # Name es @@ -553,7 +553,7 @@ spec: cpu: 200m pmm: enabled: false - image: percona/pmm-client:2.42.0 + image: perconalab/pmm-client:dev-latest serverHost: monitoring-service # serverUser: admin # pxcParams: "--disable-tablestats-limit=2000" @@ -566,7 +566,7 @@ spec: cpu: 300m backup: # allowParallel: true - image: percona/percona-xtradb-cluster-operator:1.15.0-pxc8.0-backup-pxb8.0.35 + image: perconalab/percona-xtradb-cluster-operator:main-pxc8.0-backup # backoffLimit: 6 # serviceAccountName: percona-xtradb-cluster-operator # imagePullSecrets: diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 2705531687..4504a5a798 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -11318,7 +11318,7 @@ spec: value: percona-xtradb-cluster-operator - name: DISABLE_TELEMETRY value: "false" - image: percona/percona-xtradb-cluster-operator:1.15.0 + image: perconalab/percona-xtradb-cluster-operator:main imagePullPolicy: Always resources: limits: diff --git a/deploy/cw-operator.yaml b/deploy/cw-operator.yaml index 2c190ba880..4e498668cf 100644 --- a/deploy/cw-operator.yaml +++ b/deploy/cw-operator.yaml @@ -42,7 +42,7 @@ spec: value: percona-xtradb-cluster-operator - name: DISABLE_TELEMETRY value: "false" - image: percona/percona-xtradb-cluster-operator:1.15.0 + image: perconalab/percona-xtradb-cluster-operator:main imagePullPolicy: Always resources: limits: diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 8421df2983..de903e0393 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -45,7 +45,7 @@ spec: value: percona-xtradb-cluster-operator - name: DISABLE_TELEMETRY value: "false" - image: percona/percona-xtradb-cluster-operator:1.15.0 + image: perconalab/percona-xtradb-cluster-operator:main imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1130.yml b/e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1160.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1130.yml rename to e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1160.yml diff --git a/e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1130.yml b/e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1160.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1130.yml rename to e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1160.yml diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127.yml index 2a8f5341d3..24b74084f7 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 2 + generation: 1 name: some-name-proxysql ownerReferences: - controller: true diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150-k127.yml index fd94e821f1..da341987be 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150-k127.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150-k127.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 3 + generation: 2 name: some-name-proxysql ownerReferences: - controller: true diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130-k127-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127-oc.yml similarity index 85% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130-k127-oc.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127-oc.yml index 077149e568..43a9e27175 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130-k127-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127-oc.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 1 + generation: 3 name: some-name-proxysql ownerReferences: - controller: true @@ -43,7 +43,15 @@ spec: app.kubernetes.io/part-of: percona-xtradb-cluster topologyKey: kubernetes.io/hostname containers: - - env: + - args: + - proxysql + - -f + - -c + - /etc/proxysql/proxysql.cnf + - --reload + command: + - /opt/percona/proxysql-entrypoint.sh + env: - name: PXC_SERVICE value: some-name-pxc - name: OPERATOR_PASSWORD @@ -92,9 +100,11 @@ spec: name: ssl - mountPath: /etc/proxysql/ssl-internal name: ssl-internal + - mountPath: /opt/percona + name: bin - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_pxc_nodes.sh + - /opt/percona/peer-list + - -on-change=/opt/percona/proxysql_add_pxc_nodes.sh - -service=$(PXC_SERVICE) env: - name: PXC_SERVICE @@ -125,9 +135,12 @@ spec: resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_proxysql_nodes.sh + - /opt/percona/peer-list + - -on-change=/opt/percona/proxysql_add_proxysql_nodes.sh - -service=$(PROXYSQL_SERVICE) env: - name: PROXYSQL_SERVICE @@ -158,6 +171,9 @@ spec: resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin dnsPolicy: ClusterFirst initContainers: - command: @@ -166,16 +182,26 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: - mountPath: /var/lib/mysql name: bin + - command: + - /proxysql-init-entrypoint.sh + imagePullPolicy: Always + name: proxysql-init + resources: + limits: + cpu: 50m + memory: 50M + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin restartPolicy: Always schedulerName: default-scheduler securityContext: diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127.yml similarity index 85% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130-k127.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127.yml index dd40f6b65a..fd94e821f1 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130-k127.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 1 + generation: 3 name: some-name-proxysql ownerReferences: - controller: true @@ -43,7 +43,15 @@ spec: app.kubernetes.io/part-of: percona-xtradb-cluster topologyKey: kubernetes.io/hostname containers: - - env: + - args: + - proxysql + - -f + - -c + - /etc/proxysql/proxysql.cnf + - --reload + command: + - /opt/percona/proxysql-entrypoint.sh + env: - name: PXC_SERVICE value: some-name-pxc - name: OPERATOR_PASSWORD @@ -92,9 +100,11 @@ spec: name: ssl - mountPath: /etc/proxysql/ssl-internal name: ssl-internal + - mountPath: /opt/percona + name: bin - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_pxc_nodes.sh + - /opt/percona/peer-list + - -on-change=/opt/percona/proxysql_add_pxc_nodes.sh - -service=$(PXC_SERVICE) env: - name: PXC_SERVICE @@ -125,9 +135,12 @@ spec: resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_proxysql_nodes.sh + - /opt/percona/peer-list + - -on-change=/opt/percona/proxysql_add_proxysql_nodes.sh - -service=$(PROXYSQL_SERVICE) env: - name: PROXYSQL_SERVICE @@ -158,6 +171,9 @@ spec: resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin dnsPolicy: ClusterFirst initContainers: - command: @@ -166,16 +182,26 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: - mountPath: /var/lib/mysql name: bin + - command: + - /proxysql-init-entrypoint.sh + imagePullPolicy: Always + name: proxysql-init + resources: + limits: + cpu: 50m + memory: 50M + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin restartPolicy: Always schedulerName: default-scheduler securityContext: diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-oc.yml similarity index 84% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130-oc.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-oc.yml index e06c4ad093..7700138edd 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-oc.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 1 + generation: 3 name: some-name-proxysql ownerReferences: - controller: true @@ -40,7 +40,15 @@ spec: app.kubernetes.io/part-of: percona-xtradb-cluster topologyKey: kubernetes.io/hostname containers: - - env: + - args: + - proxysql + - -f + - -c + - /etc/proxysql/proxysql.cnf + - --reload + command: + - /opt/percona/proxysql-entrypoint.sh + env: - name: PXC_SERVICE value: some-name-pxc - name: OPERATOR_PASSWORD @@ -89,9 +97,11 @@ spec: name: ssl - mountPath: /etc/proxysql/ssl-internal name: ssl-internal + - mountPath: /opt/percona + name: bin - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_pxc_nodes.sh + - /opt/percona/peer-list + - -on-change=/opt/percona/proxysql_add_pxc_nodes.sh - -service=$(PXC_SERVICE) env: - name: PXC_SERVICE @@ -122,9 +132,12 @@ spec: resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_proxysql_nodes.sh + - /opt/percona/peer-list + - -on-change=/opt/percona/proxysql_add_proxysql_nodes.sh - -service=$(PROXYSQL_SERVICE) env: - name: PROXYSQL_SERVICE @@ -155,6 +168,9 @@ spec: resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin dnsPolicy: ClusterFirst initContainers: - command: @@ -163,16 +179,26 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: - mountPath: /var/lib/mysql name: bin + - command: + - /proxysql-init-entrypoint.sh + imagePullPolicy: Always + name: proxysql-init + resources: + limits: + cpu: 50m + memory: 50M + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin restartPolicy: Always schedulerName: default-scheduler securityContext: diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160.yml similarity index 91% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160.yml index 596dd560a7..9df069f53f 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1130.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 2 + generation: 4 name: some-name-proxysql ownerReferences: - controller: true @@ -89,9 +89,11 @@ spec: name: ssl - mountPath: /etc/proxysql/ssl-internal name: ssl-internal + - mountPath: /opt/percona + name: bin - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_pxc_nodes.sh + - /opt/percona/peer-list + - -on-change=/opt/percona/proxysql_add_pxc_nodes.sh - -service=$(PXC_SERVICE) env: - name: PXC_SERVICE @@ -122,9 +124,12 @@ spec: resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_proxysql_nodes.sh + - /opt/percona/peer-list + - -on-change=/opt/percona/proxysql_add_proxysql_nodes.sh - -service=$(PROXYSQL_SERVICE) env: - name: PROXYSQL_SERVICE @@ -155,6 +160,9 @@ spec: resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin dnsPolicy: ClusterFirst initContainers: - command: @@ -163,11 +171,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100m + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: @@ -179,13 +184,13 @@ spec: name: proxysql-init resources: limits: - cpu: 700m - memory: 1G - requests: - cpu: 100m - memory: 100m + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File + volumeMounts: + - mountPath: /opt/percona + name: bin restartPolicy: Always schedulerName: default-scheduler securityContext: diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml index d00b0abed2..1449ca31f0 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 2 + generation: 1 name: some-name-pxc ownerReferences: - controller: true diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127.yml index 26aa2521fa..d00b0abed2 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 3 + generation: 2 name: some-name-pxc ownerReferences: - controller: true diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130-k127-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127-oc.yml similarity index 96% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130-k127-oc.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127-oc.yml index 74423bf7de..9f269576f7 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130-k127-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127-oc.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 1 + generation: 3 name: some-name-pxc ownerReferences: - controller: true @@ -194,6 +194,8 @@ spec: name: auto-config - mountPath: /etc/mysql/vault-keyring-secret name: vault-keyring-secret + - mountPath: /etc/mysql/init-file + name: mysql-init-file dnsPolicy: ClusterFirst initContainers: - command: @@ -202,11 +204,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: @@ -253,6 +252,11 @@ spec: defaultMode: 420 optional: false secretName: internal-some-name + - name: mysql-init-file + secret: + defaultMode: 420 + optional: true + secretName: some-name-mysql-init updateStrategy: rollingUpdate: partition: 0 diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127.yml similarity index 96% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130-k127.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127.yml index a9359f25ae..26aa2521fa 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130-k127.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 1 + generation: 3 name: some-name-pxc ownerReferences: - controller: true @@ -194,6 +194,8 @@ spec: name: auto-config - mountPath: /etc/mysql/vault-keyring-secret name: vault-keyring-secret + - mountPath: /etc/mysql/init-file + name: mysql-init-file dnsPolicy: ClusterFirst initContainers: - command: @@ -202,11 +204,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: @@ -254,6 +253,11 @@ spec: defaultMode: 420 optional: false secretName: internal-some-name + - name: mysql-init-file + secret: + defaultMode: 420 + optional: true + secretName: some-name-mysql-init updateStrategy: rollingUpdate: partition: 0 diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-oc.yml similarity index 96% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130-oc.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-oc.yml index 943a916671..1973f5f996 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-oc.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 1 + generation: 3 name: some-name-pxc ownerReferences: - controller: true @@ -191,6 +191,8 @@ spec: name: auto-config - mountPath: /etc/mysql/vault-keyring-secret name: vault-keyring-secret + - mountPath: /etc/mysql/init-file + name: mysql-init-file dnsPolicy: ClusterFirst initContainers: - command: @@ -199,11 +201,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: @@ -250,6 +249,11 @@ spec: defaultMode: 420 optional: false secretName: internal-some-name + - name: mysql-init-file + secret: + defaultMode: 420 + optional: true + secretName: some-name-mysql-init updateStrategy: rollingUpdate: partition: 0 diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160.yml similarity index 96% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160.yml index 50f10a75fa..8fea3e88a2 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1130.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160.yml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 2 + generation: 4 name: some-name-pxc ownerReferences: - controller: true @@ -191,6 +191,8 @@ spec: name: auto-config - mountPath: /etc/mysql/vault-keyring-secret name: vault-keyring-secret + - mountPath: /etc/mysql/init-file + name: mysql-init-file dnsPolicy: ClusterFirst initContainers: - command: @@ -199,11 +201,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: @@ -251,6 +250,11 @@ spec: defaultMode: 420 optional: false secretName: internal-some-name + - name: mysql-init-file + secret: + defaultMode: 420 + optional: true + secretName: some-name-mysql-init updateStrategy: rollingUpdate: partition: 0 diff --git a/e2e-tests/upgrade-consistency/run b/e2e-tests/upgrade-consistency/run index b23200a72f..0d61042238 100755 --- a/e2e-tests/upgrade-consistency/run +++ b/e2e-tests/upgrade-consistency/run @@ -38,27 +38,15 @@ main() { kubectl_bin apply \ -f "$test_dir/conf/secrets.yml" cat_config "$conf_dir/$cluster.yml" \ - | yq eval '.spec.crVersion = "1.13.0"' - \ + | yq eval '.spec.crVersion = "1.14.0"' - \ | kubectl_bin apply -f - - desc "test 1.13.0" - kubectl_bin patch pxc "$cluster" --type=merge --patch '{ - "spec": {"crVersion":"1.13.0"} - }' - wait_cluster_consistency "$cluster" 3 2 - wait_for_sts_generation "$cluster-pxc" "1" "1" - desc "compare k8s objects" - compare_kubectl service/$cluster-pxc "-1130" - compare_kubectl service/$cluster-proxysql "-1130" - compare_kubectl statefulset/$cluster-pxc "-1130" - compare_kubectl statefulset/$cluster-proxysql "-1130" - desc "test 1.14.0" kubectl_bin patch pxc "$cluster" --type=merge --patch '{ "spec": {"crVersion":"1.14.0"} }' wait_cluster_consistency "$cluster" 3 2 - wait_for_sts_generation "$cluster-pxc" "2" "1" + wait_for_sts_generation "$cluster-pxc" "1" "1" desc "compare k8s objects" compare_kubectl service/$cluster-pxc "-1140" compare_kubectl service/$cluster-proxysql "-1140" @@ -70,13 +58,25 @@ main() { "spec": {"crVersion":"1.15.0"} }' wait_cluster_consistency "$cluster" 3 2 - wait_for_sts_generation "$cluster-pxc" "3" "1" + wait_for_sts_generation "$cluster-pxc" "2" "1" desc "compare k8s objects" compare_kubectl service/$cluster-pxc "-1150" compare_kubectl service/$cluster-proxysql "-1150" compare_kubectl statefulset/$cluster-pxc "-1150" compare_kubectl statefulset/$cluster-proxysql "-1150" + desc "test 1.16.0" + kubectl_bin patch pxc "$cluster" --type=merge --patch '{ + "spec": {"crVersion":"1.16.0"} + }' + wait_cluster_consistency "$cluster" 3 2 + wait_for_sts_generation "$cluster-pxc" "3" "1" + desc "compare k8s objects" + compare_kubectl service/$cluster-pxc "-1160" + compare_kubectl service/$cluster-proxysql "-1160" + compare_kubectl statefulset/$cluster-pxc "-1160" + compare_kubectl statefulset/$cluster-proxysql "-1160" + destroy "${namespace}" desc "test passed" } diff --git a/version/version.go b/version/version.go index b968bb819f..3e5b1d8345 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version var ( - Version = "1.15.0" + Version = "1.16.0" ) From 45b703f113626a4f38fbad5e01976b3742531422 Mon Sep 17 00:00:00 2001 From: Pavel Tankov <4014969+ptankov@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:01:34 +0300 Subject: [PATCH 2/2] Update mysql_servers_ssl_params and runtime_mysql_servers_ssl_params --- e2e-tests/users/compare/select-2.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/e2e-tests/users/compare/select-2.sql b/e2e-tests/users/compare/select-2.sql index d41773703b..bea26c472e 100644 --- a/e2e-tests/users/compare/select-2.sql +++ b/e2e-tests/users/compare/select-2.sql @@ -12,6 +12,7 @@ mysql_query_rules mysql_query_rules_fast_routing mysql_replication_hostgroups mysql_servers +mysql_servers_ssl_params mysql_users proxysql_servers restapi_routes @@ -29,6 +30,7 @@ runtime_mysql_query_rules runtime_mysql_query_rules_fast_routing runtime_mysql_replication_hostgroups runtime_mysql_servers +runtime_mysql_servers_ssl_params runtime_mysql_users runtime_proxysql_servers runtime_restapi_routes