Merge pull request #1924 from percona/update-versions-1161

K8SPXC-1537: Update images and versions for 1.16.1 release
percona · Dec 24, 2024 · 0ef122a · 0ef122a
2 parents e82ff3f + fe173c0
commit 0ef122a
Show file tree

Hide file tree

Showing 25 changed files with 92 additions and 1,811 deletions.
diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -11522,7 +11522,7 @@ spec:
           value: percona-xtradb-cluster-operator
         - name: DISABLE_TELEMETRY
           value: "false"
-        image: percona/percona-xtradb-cluster-operator:1.16.0
+        image: percona/percona-xtradb-cluster-operator:1.16.1
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3

diff --git a/deploy/cr-minimal.yaml b/deploy/cr-minimal.yaml
@@ -3,7 +3,7 @@ kind: PerconaXtraDBCluster
 metadata:
   name: minimal-cluster
 spec:
-  crVersion: 1.16.0
+  crVersion: 1.16.1
   secretsName: minimal-cluster-secrets
   unsafeFlags:
     tls: true
@@ -28,4 +28,4 @@ spec:
     image: percona/haproxy:2.8.11
   logcollector:
     enabled: true
-    image: percona/percona-xtradb-cluster-operator:1.16.0-logcollector-fluentbit3.2.2
+    image: percona/percona-xtradb-cluster-operator:1.16.1-logcollector-fluentbit3.2.2
diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -10,7 +10,7 @@ metadata:
 #  annotations:
 #    percona.com/issue-vault-token: "true"
 spec:
-  crVersion: 1.16.0
+  crVersion: 1.16.1
 #  enableVolumeExpansion: false
 #  ignoreAnnotations:
 #    - iam.amazonaws.com/role
@@ -22,7 +22,7 @@ spec:
 #  sslInternalSecretName: cluster1-ssl-internal
 #  logCollectorSecretName: cluster1-log-collector-secrets
 #  initContainer:
-#    image: percona/percona-xtradb-cluster-operator:1.16.0
+#    image: percona/percona-xtradb-cluster-operator:1.16.1
 #    containerSecurityContext:
 #      privileged: false
 #      runAsUser: 1001
@@ -543,7 +543,7 @@ spec:
 #     - 10.0.0.0/8
   logcollector:
     enabled: true
-    image: percona/percona-xtradb-cluster-operator:1.16.0-logcollector-fluentbit3.2.2
+    image: percona/percona-xtradb-cluster-operator:1.16.1-logcollector-fluentbit3.2.2
 #    configuration: |
 #      [OUTPUT]
 #           Name  es
@@ -589,7 +589,7 @@ spec:
         cpu: 300m
   backup:
 #    allowParallel: true
-    image: percona/percona-xtradb-cluster-operator:1.16.0-pxc8.0-backup-pxb8.0.35
+    image: percona/percona-xtradb-cluster-operator:1.16.1-pxc8.0-backup-pxb8.0.35
 #    backoffLimit: 6
 #    activeDeadlineSeconds: 3600
 #    serviceAccountName: percona-xtradb-cluster-operator

diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -11532,7 +11532,7 @@ spec:
           value: percona-xtradb-cluster-operator
         - name: DISABLE_TELEMETRY
           value: "false"
-        image: percona/percona-xtradb-cluster-operator:1.16.0
+        image: percona/percona-xtradb-cluster-operator:1.16.1
         imagePullPolicy: Always
         resources:
           limits:

diff --git 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.16.0
+        image: percona/percona-xtradb-cluster-operator:1.16.1
         imagePullPolicy: Always
         resources:
           limits:

diff --git 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.16.0
+        image: percona/percona-xtradb-cluster-operator:1.16.1
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3

diff --git a/e2e-tests/functions b/e2e-tests/functions
@@ -496,6 +496,7 @@ compare_kubectl() {
 			(.. | select(tag == "!!str")) |= sub("'$namespace'", "namespace") |
 			(.. | select(tag == "!!str")) |= sub("kube-api-access-.*", "kube-api-access") |
 			del(.. | select(has("annotations")).annotations | select(length==0)) |
+			del(.spec.crVersion) |
 			del(.. | select(.[] == "percona-xtradb-cluster-operator-workload-token*"))' - >${new_result}
 
 	diff -u ${expected_result} ${new_result}

diff --git a/e2e-tests/release_versions b/e2e-tests/release_versions
@@ -1,18 +1,18 @@
 # Images versions
-IMAGE_OPERATOR=percona/percona-xtradb-cluster-operator:1.16.0
+IMAGE_OPERATOR=percona/percona-xtradb-cluster-operator:1.16.1
 
 IMAGE_PXC84=percona/percona-xtradb-cluster:8.4.2-2.1
-IMAGE_BACKUP84=percona/percona-xtradb-cluster-operator:1.16.0-pxc8.4-backup-pxb8.4.0
+IMAGE_BACKUP84=percona/percona-xtradb-cluster-operator:1.16.1-pxc8.4-backup-pxb8.4.0
 
 IMAGE_PXC80=percona/percona-xtradb-cluster:8.0.39-30.1
-IMAGE_BACKUP80=percona/percona-xtradb-cluster-operator:1.16.0-pxc8.0-backup-pxb8.0.35
+IMAGE_BACKUP80=percona/percona-xtradb-cluster-operator:1.16.1-pxc8.0-backup-pxb8.0.35
 
 IMAGE_PXC57=percona/percona-xtradb-cluster:5.7.44-31.65
-IMAGE_BACKUP57=percona/percona-xtradb-cluster-operator:1.16.0-pxc5.7-backup-pxb2.4.29
+IMAGE_BACKUP57=percona/percona-xtradb-cluster-operator:1.16.1-pxc5.7-backup-pxb2.4.29
 
 IMAGE_PROXY=percona/proxysql2:2.7.1
 IMAGE_HAPROXY=percona/haproxy:2.8.11
-IMAGE_LOGCOLLECTOR=percona/percona-xtradb-cluster-operator:1.16.0-logcollector-fluentbit3.2.2
+IMAGE_LOGCOLLECTOR=percona/percona-xtradb-cluster-operator:1.16.1-logcollector-fluentbit3.2.2
 IMAGE_PMM_CLIENT=percona/pmm-client:2.44.0
 IMAGE_PMM_SERVER=percona/pmm-server:2.44.0
 

diff --git a/e2e-tests/tls-issue-self/compare/pxc_some-name-enabled.yml b/e2e-tests/tls-issue-self/compare/pxc_some-name-enabled.yml
@@ -35,7 +35,6 @@ spec:
             resources:
               requests:
                 storage: 1Gi
-  crVersion: 1.16.0
   logcollector:
     enabled: true
   pmm:

diff --git a/e2e-tests/tls-issue-self/compare/pxc_some-name.yml b/e2e-tests/tls-issue-self/compare/pxc_some-name.yml
@@ -35,7 +35,6 @@ spec:
             resources:
               requests:
                 storage: 1Gi
-  crVersion: 1.16.0
   logcollector:
     enabled: true
   pmm:

diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-k127.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-k127.yml
diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml
@@ -8,6 +8,9 @@ metadata:
       kind: PerconaXtraDBCluster
       name: upgrade-haproxy
 spec:
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: Retain
+    whenScaled: Retain
   podManagementPolicy: OrderedReady
   replicas: 3
   revisionHistoryLimit: 10
@@ -40,7 +43,11 @@ spec:
                   app.kubernetes.io/part-of: percona-xtradb-cluster
               topologyKey: kubernetes.io/hostname
       containers:
-        - env:
+        - args:
+            - haproxy
+          command:
+            - /opt/percona/haproxy-entrypoint.sh
+          env:
             - name: PXC_SERVICE
               value: upgrade-haproxy-pxc
             - name: LIVENESS_CHECK_TIMEOUT
@@ -108,6 +115,8 @@ spec:
             - /opt/percona/peer-list
             - -on-change=/opt/percona/haproxy_add_pxc_nodes.sh
             - -service=$(PXC_SERVICE)
+          command:
+            - /opt/percona/haproxy-entrypoint.sh
           env:
             - name: PXC_SERVICE
               value: upgrade-haproxy-pxc
@@ -131,6 +140,8 @@ spec:
               name: mysql-users-secret-file
             - mountPath: /etc/mysql/haproxy-env-secret
               name: upgrade-haproxy-env-vars-haproxy
+            - mountPath: /opt/percona
+              name: bin
       dnsPolicy: ClusterFirst
       initContainers:
         - command: