Add annotations for .spec.volumeClaimTemplate and clean up k127 for p…

…roxies tests
percona · Dec 23, 2024 · 16fbe8e · 16fbe8e
1 parent 28e4de4
commit 16fbe8e
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 1,793 deletions.
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: