Merge branch 'main' into release-1.16.1

percona · Dec 26, 2024 · 39745f7 · 39745f7
2 parents 0ef122a + 5a0fd38
commit 39745f7
Show file tree

Hide file tree

Showing 17 changed files with 114 additions and 43 deletions.
diff --git a/deploy/cr-minimal.yaml b/deploy/cr-minimal.yaml
@@ -16,7 +16,7 @@ spec:
     enabled: false
   pxc:
     size: 1
-    image: percona/percona-xtradb-cluster:8.0.39-30.1
+    image: perconalab/percona-xtradb-cluster-operator:main-pxc8.0
     volumeSpec:
       persistentVolumeClaim:
         resources:
@@ -25,7 +25,8 @@ spec:
   haproxy:
     enabled: true
     size: 1
-    image: percona/haproxy:2.8.11
+    image: perconalab/percona-xtradb-cluster-operator:main-haproxy
   logcollector:
     enabled: true
     image: percona/percona-xtradb-cluster-operator:1.16.1-logcollector-fluentbit3.2.2
+
diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -58,7 +58,7 @@ spec:
     schedule: "0 4 * * *"
   pxc:
     size: 3
-    image: percona/percona-xtradb-cluster:8.0.39-30.1
+    image: perconalab/percona-xtradb-cluster-operator:main-pxc8.0
     autoRecovery: true
 #    expose:
 #      enabled: true
@@ -206,7 +206,7 @@ spec:
   haproxy:
     enabled: true
     size: 3
-    image: percona/haproxy:2.8.11
+    image: perconalab/percona-xtradb-cluster-operator:main-haproxy
 #    imagePullPolicy: Always
 #    schedulerName: mycustom-scheduler
 #    readinessDelaySec: 15
@@ -381,7 +381,7 @@ spec:
   proxysql:
     enabled: false
     size: 3
-    image: percona/proxysql2:2.7.1
+    image: perconalab/percona-xtradb-cluster-operator:main-proxysql
 #    imagePullPolicy: Always
 #    configuration: |
 #      datadir="/var/lib/proxysql"
@@ -576,7 +576,7 @@ spec:
 
   pmm:
     enabled: false
-    image: percona/pmm-client:2.44.0
+    image: perconalab/pmm-client:dev-latest
     serverHost: monitoring-service
 #    serverUser: admin
 #    pxcParams: "--disable-tablestats-limit=2000"

diff --git a/...mpare/service_some-name-proxysql-1141.yml → ...mpare/service_some-name-proxysql-1170.yml b/...mpare/service_some-name-proxysql-1141.yml → ...mpare/service_some-name-proxysql-1170.yml
@@ -26,6 +26,8 @@ spec:
   selector:
     app.kubernetes.io/component: proxysql
     app.kubernetes.io/instance: some-name
+    app.kubernetes.io/managed-by: percona-xtradb-cluster-operator
     app.kubernetes.io/name: percona-xtradb-cluster
+    app.kubernetes.io/part-of: percona-xtradb-cluster
   sessionAffinity: None
   type: ClusterIP
diff --git a/...cy/compare/service_some-name-pxc-1141.yml → ...cy/compare/service_some-name-pxc-1170.yml b/...cy/compare/service_some-name-pxc-1141.yml → ...cy/compare/service_some-name-pxc-1170.yml
@@ -30,6 +30,8 @@ spec:
   selector:
     app.kubernetes.io/component: pxc
     app.kubernetes.io/instance: some-name
+    app.kubernetes.io/managed-by: percona-xtradb-cluster-operator
     app.kubernetes.io/name: percona-xtradb-cluster
+    app.kubernetes.io/part-of: percona-xtradb-cluster
   sessionAffinity: None
   type: ClusterIP
diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1151-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1151-oc.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-1151.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1151.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-1160-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: 3
+  generation: 2
   name: some-name-proxysql
   ownerReferences:
     - controller: true

diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160.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/...tatefulset_some-name-proxysql-1141-oc.yml → ...tatefulset_some-name-proxysql-1170-oc.yml b/...tatefulset_some-name-proxysql-1141-oc.yml → ...tatefulset_some-name-proxysql-1170-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:
@@ -173,6 +189,19 @@ spec:
           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/...e/statefulset_some-name-proxysql-1141.yml → ...e/statefulset_some-name-proxysql-1170.yml b/...e/statefulset_some-name-proxysql-1141.yml → ...e/statefulset_some-name-proxysql-1170.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:
@@ -173,6 +189,19 @@ spec:
           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-pxc-1151-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1151-oc.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-1151.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1151.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-1160-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: 3
+  generation: 2
   name: some-name-pxc
   ownerReferences:
     - controller: true

diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160.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/...are/statefulset_some-name-pxc-1141-oc.yml → ...are/statefulset_some-name-pxc-1170-oc.yml b/...are/statefulset_some-name-pxc-1141-oc.yml → ...are/statefulset_some-name-pxc-1170-oc.yml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  generation: 1
+  generation: 3
   name: some-name-pxc
   ownerReferences:
     - controller: true
@@ -125,6 +125,10 @@ spec:
               value: "15"
             - name: DEFAULT_AUTHENTICATION_PLUGIN
               value: mysql_native_password
+            - name: MYSQL_NOTIFY_SOCKET
+              value: /var/lib/mysql/notify.sock
+            - name: MYSQL_STATE_FILE
+              value: /var/lib/mysql/mysql.state
           envFrom:
             - secretRef:
                 name: some-name-env-vars-pxc

diff --git a/...ompare/statefulset_some-name-pxc-1141.yml → ...ompare/statefulset_some-name-pxc-1170.yml b/...ompare/statefulset_some-name-pxc-1141.yml → ...ompare/statefulset_some-name-pxc-1170.yml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  generation: 1
+  generation: 3
   name: some-name-pxc
   ownerReferences:
     - controller: true
@@ -125,6 +125,10 @@ spec:
               value: "15"
             - name: DEFAULT_AUTHENTICATION_PLUGIN
               value: mysql_native_password
+            - name: MYSQL_NOTIFY_SOCKET
+              value: /var/lib/mysql/notify.sock
+            - name: MYSQL_STATE_FILE
+              value: /var/lib/mysql/mysql.state
           envFrom:
             - secretRef:
                 name: some-name-env-vars-pxc