From d70683deb23e3da2b1f52d5b5eab70e084734336 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Mon, 23 Dec 2024 18:54:36 +0200 Subject: [PATCH 1/3] K8SPXC-1537: Update images and versions for 1.16.1 release --- deploy/bundle.yaml | 2 +- deploy/cr-minimal.yaml | 4 ++-- deploy/cr.yaml | 8 ++++---- deploy/cw-bundle.yaml | 2 +- deploy/cw-operator.yaml | 2 +- deploy/operator.yaml | 2 +- e2e-tests/release_versions | 10 +++++----- version/version.go | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index b49a9b175..c254b2b0c 100644 --- 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 index e6ee1e879..15be85d4d 100644 --- 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 index 42fc8d06c..eda646ded 100644 --- 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 index ff6ce4ba4..bd5977aba 100644 --- 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 index c9dd05415..3f0210ea4 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.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 index 67bd5c469..6cf721cb5 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.16.0 + image: percona/percona-xtradb-cluster-operator:1.16.1 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/e2e-tests/release_versions b/e2e-tests/release_versions index 61af93eb5..c1d8bc534 100644 --- 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/version/version.go b/version/version.go index 3e5b1d834..e3164ec04 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version var ( - Version = "1.16.0" + Version = "1.16.1" ) From e8cbcec27cbdd57707c64c0bee498cbb0935830a Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Mon, 23 Dec 2024 09:27:54 +0200 Subject: [PATCH 2/3] Add delete .spec.crVersion for compare in functions and in tls-issue-self diffs --- e2e-tests/functions | 1 + e2e-tests/tls-issue-self/compare/pxc_some-name-enabled.yml | 1 - e2e-tests/tls-issue-self/compare/pxc_some-name.yml | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/e2e-tests/functions b/e2e-tests/functions index 93bdda43f..ec9549928 100755 --- 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/tls-issue-self/compare/pxc_some-name-enabled.yml b/e2e-tests/tls-issue-self/compare/pxc_some-name-enabled.yml index 0124f4979..264d3c94f 100644 --- 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 index 5e96b6304..5bbf5a8c7 100644 --- 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: From fe173c0f7ad991e6b43fcba877b965b6a9c2cf00 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Mon, 23 Dec 2024 14:13:10 +0200 Subject: [PATCH 3/3] Add annotations for .spec.volumeClaimTemplate and clean up k127 for proxies tests --- ...atefulset_upgrade-haproxy-haproxy-k127.yml | 202 ------------- .../statefulset_upgrade-haproxy-haproxy.yml | 13 +- ...tatefulset_upgrade-haproxy-pxc-k127-oc.yml | 279 ----------------- .../statefulset_upgrade-haproxy-pxc-k127.yml | 280 ------------------ .../statefulset_upgrade-haproxy-pxc-oc.yml | 9 + .../statefulset_upgrade-haproxy-pxc.yml | 9 + ...lset_upgrade-proxysql-proxysql-k127-oc.yml | 235 --------------- ...efulset_upgrade-proxysql-proxysql-k127.yml | 236 --------------- ...atefulset_upgrade-proxysql-proxysql-oc.yml | 9 + .../statefulset_upgrade-proxysql-proxysql.yml | 19 +- ...atefulset_upgrade-proxysql-pxc-k127-oc.yml | 279 ----------------- .../statefulset_upgrade-proxysql-pxc-k127.yml | 280 ------------------ .../statefulset_upgrade-proxysql-pxc-oc.yml | 9 + .../statefulset_upgrade-proxysql-pxc.yml | 9 + 14 files changed, 75 insertions(+), 1793 deletions(-) delete mode 100644 e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-k127.yml delete mode 100644 e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127-oc.yml delete mode 100644 e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127.yml delete mode 100644 e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127-oc.yml delete mode 100644 e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127.yml delete mode 100644 e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127-oc.yml delete mode 100644 e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127.yml 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 deleted file mode 100644 index 8691d5d17..000000000 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-k127.yml +++ /dev/null @@ -1,202 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 2 - name: upgrade-haproxy-haproxy - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: upgrade-haproxy -spec: - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - app.kubernetes.io/component: haproxy - app.kubernetes.io/instance: upgrade-haproxy - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - serviceName: upgrade-haproxy-haproxy - template: - metadata: - labels: - app.kubernetes.io/component: haproxy - app.kubernetes.io/instance: upgrade-haproxy - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app.kubernetes.io/component: haproxy - app.kubernetes.io/instance: upgrade-haproxy - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - topologyKey: kubernetes.io/hostname - containers: - - args: - - haproxy - command: - - /opt/percona/haproxy-entrypoint.sh - env: - - name: PXC_SERVICE - value: upgrade-haproxy-pxc - - name: LIVENESS_CHECK_TIMEOUT - value: "5" - - name: READINESS_CHECK_TIMEOUT - value: "1" - envFrom: - - secretRef: - name: upgrade-haproxy-env-vars-haproxy - optional: true - imagePullPolicy: Always - livenessProbe: - exec: - command: - - /opt/percona/haproxy_liveness_check.sh - failureThreshold: 4 - initialDelaySeconds: 60 - periodSeconds: 30 - successThreshold: 1 - timeoutSeconds: 5 - name: haproxy - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 3307 - name: mysql-replicas - protocol: TCP - - containerPort: 3309 - name: proxy-protocol - protocol: TCP - - containerPort: 33062 - name: mysql-admin - protocol: TCP - - containerPort: 33060 - name: mysqlx - protocol: TCP - readinessProbe: - exec: - command: - - /opt/percona/haproxy_readiness_check.sh - failureThreshold: 3 - initialDelaySeconds: 15 - periodSeconds: 5 - successThreshold: 1 - timeoutSeconds: 1 - resources: - requests: - cpu: 600m - memory: 1G - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /etc/haproxy-custom/ - name: haproxy-custom - - mountPath: /etc/haproxy/pxc - name: haproxy-auto - - mountPath: /opt/percona - name: bin - - mountPath: /etc/mysql/mysql-users-secret - name: mysql-users-secret-file - - mountPath: /etc/mysql/haproxy-env-secret - name: upgrade-haproxy-env-vars-haproxy - - args: - - /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 - - name: REPLICAS_SVC_ONLY_READERS - value: "false" - envFrom: - - secretRef: - name: upgrade-haproxy-env-vars-haproxy - optional: true - imagePullPolicy: Always - name: pxc-monit - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /etc/haproxy-custom/ - name: haproxy-custom - - mountPath: /etc/haproxy/pxc - name: haproxy-auto - - mountPath: /etc/mysql/mysql-users-secret - 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: - - /pxc-init-entrypoint.sh - imagePullPolicy: Always - name: pxc-init - resources: - limits: - cpu: 50m - memory: 50M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: bin - - command: - - /haproxy-init-entrypoint.sh - imagePullPolicy: Always - name: haproxy-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: {} - serviceAccount: default - serviceAccountName: default - terminationGracePeriodSeconds: 30 - volumes: - - configMap: - defaultMode: 420 - name: upgrade-haproxy-haproxy - optional: true - name: haproxy-custom - - emptyDir: {} - name: haproxy-auto - - name: mysql-users-secret-file - secret: - defaultMode: 420 - optional: false - secretName: internal-upgrade-haproxy - - name: upgrade-haproxy-env-vars-haproxy - secret: - defaultMode: 420 - optional: true - secretName: upgrade-haproxy-env-vars-haproxy - - emptyDir: {} - name: bin - updateStrategy: - rollingUpdate: - partition: 0 - type: RollingUpdate diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml index b5e6f0f05..8691d5d17 100644 --- 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: diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127-oc.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127-oc.yml deleted file mode 100644 index 73b8157e4..000000000 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127-oc.yml +++ /dev/null @@ -1,279 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 2 - name: upgrade-haproxy-pxc - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: upgrade-haproxy -spec: - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-haproxy - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - serviceName: upgrade-haproxy-pxc - template: - metadata: - labels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-haproxy - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-haproxy - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - topologyKey: kubernetes.io/hostname - containers: - - env: - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: POD_NAMESPASE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - - name: POD_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.name - envFrom: - - secretRef: - name: upgrade-haproxy-log-collector - optional: true - imagePullPolicy: Always - name: logs - resources: - requests: - cpu: 200m - memory: 100M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - args: - - logrotate - env: - - name: SERVICE_TYPE - value: mysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-haproxy - imagePullPolicy: Always - name: logrotate - resources: - requests: - cpu: 200m - memory: 100M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - args: - - mysqld - command: - - /var/lib/mysql/pxc-entrypoint.sh - env: - - name: PXC_SERVICE - value: upgrade-haproxy-pxc-unready - - name: MONITOR_HOST - value: '%' - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: root - name: internal-upgrade-haproxy - - name: XTRABACKUP_PASSWORD - valueFrom: - secretKeyRef: - key: xtrabackup - name: internal-upgrade-haproxy - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-haproxy - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: IS_LOGCOLLECTOR - value: "yes" - - name: OPERATOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-upgrade-haproxy - - name: LIVENESS_CHECK_TIMEOUT - value: "5" - - name: READINESS_CHECK_TIMEOUT - value: "15" - - name: DEFAULT_AUTHENTICATION_PLUGIN - value: caching_sha2_password - - name: MYSQL_NOTIFY_SOCKET - value: /var/lib/mysql/notify.sock - - name: MYSQL_STATE_FILE - value: /var/lib/mysql/mysql.state - envFrom: - - secretRef: - name: upgrade-haproxy-env-vars-pxc - optional: true - imagePullPolicy: Always - livenessProbe: - exec: - command: - - /var/lib/mysql/liveness-check.sh - failureThreshold: 3 - initialDelaySeconds: 300 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 5 - name: pxc - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 4444 - name: sst - protocol: TCP - - containerPort: 4567 - name: write-set - protocol: TCP - - containerPort: 4568 - name: ist - protocol: TCP - - containerPort: 33062 - name: mysql-admin - protocol: TCP - - containerPort: 33060 - name: mysqlx - protocol: TCP - readinessProbe: - exec: - command: - - /var/lib/mysql/readiness-check.sh - failureThreshold: 5 - initialDelaySeconds: 15 - periodSeconds: 30 - successThreshold: 1 - timeoutSeconds: 15 - resources: - requests: - cpu: 600m - memory: 1G - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - mountPath: /etc/percona-xtradb-cluster.conf.d - name: config - - mountPath: /tmp - name: tmp - - mountPath: /etc/mysql/ssl - name: ssl - - mountPath: /etc/mysql/ssl-internal - name: ssl-internal - - mountPath: /etc/mysql/mysql-users-secret - name: mysql-users-secret-file - - mountPath: /etc/my.cnf.d - 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: - - /pxc-init-entrypoint.sh - imagePullPolicy: Always - name: pxc-init - resources: - limits: - cpu: 50m - memory: 50M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - restartPolicy: Always - schedulerName: default-scheduler - securityContext: - supplementalGroups: - - 1001 - serviceAccount: default - serviceAccountName: default - terminationGracePeriodSeconds: 600 - volumes: - - emptyDir: {} - name: tmp - - configMap: - defaultMode: 420 - name: upgrade-haproxy-pxc - optional: true - name: config - - name: ssl-internal - secret: - defaultMode: 420 - optional: true - secretName: some-name-ssl-internal - - name: ssl - secret: - defaultMode: 420 - optional: false - secretName: some-name-ssl - - configMap: - defaultMode: 420 - name: auto-upgrade-haproxy-pxc - optional: true - name: auto-config - - name: vault-keyring-secret - secret: - defaultMode: 420 - optional: true - secretName: some-name-vault - - name: mysql-users-secret-file - secret: - defaultMode: 420 - optional: false - secretName: internal-upgrade-haproxy - - name: mysql-init-file - secret: - defaultMode: 420 - optional: true - secretName: upgrade-haproxy-mysql-init - updateStrategy: - type: OnDelete - volumeClaimTemplates: - - metadata: - name: datadir - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 6G - status: - phase: Pending diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127.yml deleted file mode 100644 index 4e643ca34..000000000 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127.yml +++ /dev/null @@ -1,280 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 2 - name: upgrade-haproxy-pxc - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: upgrade-haproxy -spec: - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-haproxy - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - serviceName: upgrade-haproxy-pxc - template: - metadata: - labels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-haproxy - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-haproxy - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - topologyKey: kubernetes.io/hostname - containers: - - env: - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: POD_NAMESPASE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - - name: POD_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.name - envFrom: - - secretRef: - name: upgrade-haproxy-log-collector - optional: true - imagePullPolicy: Always - name: logs - resources: - requests: - cpu: 200m - memory: 100M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - args: - - logrotate - env: - - name: SERVICE_TYPE - value: mysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-haproxy - imagePullPolicy: Always - name: logrotate - resources: - requests: - cpu: 200m - memory: 100M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - args: - - mysqld - command: - - /var/lib/mysql/pxc-entrypoint.sh - env: - - name: PXC_SERVICE - value: upgrade-haproxy-pxc-unready - - name: MONITOR_HOST - value: '%' - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: root - name: internal-upgrade-haproxy - - name: XTRABACKUP_PASSWORD - valueFrom: - secretKeyRef: - key: xtrabackup - name: internal-upgrade-haproxy - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-haproxy - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: IS_LOGCOLLECTOR - value: "yes" - - name: OPERATOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-upgrade-haproxy - - name: LIVENESS_CHECK_TIMEOUT - value: "5" - - name: READINESS_CHECK_TIMEOUT - value: "15" - - name: DEFAULT_AUTHENTICATION_PLUGIN - value: caching_sha2_password - - name: MYSQL_NOTIFY_SOCKET - value: /var/lib/mysql/notify.sock - - name: MYSQL_STATE_FILE - value: /var/lib/mysql/mysql.state - envFrom: - - secretRef: - name: upgrade-haproxy-env-vars-pxc - optional: true - imagePullPolicy: Always - livenessProbe: - exec: - command: - - /var/lib/mysql/liveness-check.sh - failureThreshold: 3 - initialDelaySeconds: 300 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 5 - name: pxc - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 4444 - name: sst - protocol: TCP - - containerPort: 4567 - name: write-set - protocol: TCP - - containerPort: 4568 - name: ist - protocol: TCP - - containerPort: 33062 - name: mysql-admin - protocol: TCP - - containerPort: 33060 - name: mysqlx - protocol: TCP - readinessProbe: - exec: - command: - - /var/lib/mysql/readiness-check.sh - failureThreshold: 5 - initialDelaySeconds: 15 - periodSeconds: 30 - successThreshold: 1 - timeoutSeconds: 15 - resources: - requests: - cpu: 600m - memory: 1G - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - mountPath: /etc/percona-xtradb-cluster.conf.d - name: config - - mountPath: /tmp - name: tmp - - mountPath: /etc/mysql/ssl - name: ssl - - mountPath: /etc/mysql/ssl-internal - name: ssl-internal - - mountPath: /etc/mysql/mysql-users-secret - name: mysql-users-secret-file - - mountPath: /etc/my.cnf.d - 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: - - /pxc-init-entrypoint.sh - imagePullPolicy: Always - name: pxc-init - resources: - limits: - cpu: 50m - memory: 50M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - restartPolicy: Always - schedulerName: default-scheduler - securityContext: - fsGroup: 1001 - supplementalGroups: - - 1001 - serviceAccount: default - serviceAccountName: default - terminationGracePeriodSeconds: 600 - volumes: - - emptyDir: {} - name: tmp - - configMap: - defaultMode: 420 - name: upgrade-haproxy-pxc - optional: true - name: config - - name: ssl-internal - secret: - defaultMode: 420 - optional: true - secretName: some-name-ssl-internal - - name: ssl - secret: - defaultMode: 420 - optional: false - secretName: some-name-ssl - - configMap: - defaultMode: 420 - name: auto-upgrade-haproxy-pxc - optional: true - name: auto-config - - name: vault-keyring-secret - secret: - defaultMode: 420 - optional: true - secretName: some-name-vault - - name: mysql-users-secret-file - secret: - defaultMode: 420 - optional: false - secretName: internal-upgrade-haproxy - - name: mysql-init-file - secret: - defaultMode: 420 - optional: true - secretName: upgrade-haproxy-mysql-init - updateStrategy: - type: OnDelete - volumeClaimTemplates: - - metadata: - name: datadir - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 6G - status: - phase: Pending diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-oc.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-oc.yml index e5388ae8d..8f1c3a0eb 100644 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-oc.yml +++ b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-oc.yml @@ -8,6 +8,9 @@ metadata: kind: PerconaXtraDBCluster name: upgrade-haproxy spec: + persistentVolumeClaimRetentionPolicy: + whenDeleted: Retain + whenScaled: Retain podManagementPolicy: OrderedReady replicas: 3 revisionHistoryLimit: 10 @@ -265,6 +268,12 @@ spec: type: OnDelete volumeClaimTemplates: - metadata: + labels: + app.kubernetes.io/component: pxc + app.kubernetes.io/instance: upgrade-haproxy + app.kubernetes.io/managed-by: percona-xtradb-cluster-operator + app.kubernetes.io/name: percona-xtradb-cluster + app.kubernetes.io/part-of: percona-xtradb-cluster name: datadir spec: accessModes: diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc.yml index f637509a7..d674ed97e 100644 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc.yml +++ b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc.yml @@ -8,6 +8,9 @@ metadata: kind: PerconaXtraDBCluster name: upgrade-haproxy spec: + persistentVolumeClaimRetentionPolicy: + whenDeleted: Retain + whenScaled: Retain podManagementPolicy: OrderedReady replicas: 3 revisionHistoryLimit: 10 @@ -266,6 +269,12 @@ spec: type: OnDelete volumeClaimTemplates: - metadata: + labels: + app.kubernetes.io/component: pxc + app.kubernetes.io/instance: upgrade-haproxy + app.kubernetes.io/managed-by: percona-xtradb-cluster-operator + app.kubernetes.io/name: percona-xtradb-cluster + app.kubernetes.io/part-of: percona-xtradb-cluster name: datadir spec: accessModes: diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127-oc.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127-oc.yml deleted file mode 100644 index 64121f4e1..000000000 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127-oc.yml +++ /dev/null @@ -1,235 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 2 - name: upgrade-proxysql-proxysql - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: upgrade-proxysql -spec: - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - app.kubernetes.io/component: proxysql - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - serviceName: upgrade-proxysql-proxysql-unready - template: - metadata: - labels: - app.kubernetes.io/component: proxysql - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app.kubernetes.io/component: proxysql - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - topologyKey: kubernetes.io/hostname - containers: - - args: - - proxysql - - -f - - -c - - /etc/proxysql/proxysql.cnf - - --reload - command: - - /opt/percona/proxysql-entrypoint.sh - env: - - name: PXC_SERVICE - value: upgrade-proxysql-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-upgrade-proxysql - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-upgrade-proxysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-proxysql - envFrom: - - secretRef: - name: upgrade-proxysql-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 6032 - name: proxyadm - protocol: TCP - resources: - requests: - cpu: 600m - memory: 1G - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/proxysql - name: proxydata - - mountPath: /etc/proxysql/ssl - name: ssl - - mountPath: /etc/proxysql/ssl-internal - name: ssl-internal - - mountPath: /opt/percona - name: bin - - args: - - /opt/percona/peer-list - - -on-change=/opt/percona/proxysql_add_pxc_nodes.sh - - -service=$(PXC_SERVICE) - env: - - name: PXC_SERVICE - value: upgrade-proxysql-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-upgrade-proxysql - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-upgrade-proxysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-proxysql - envFrom: - - secretRef: - name: upgrade-proxysql-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: pxc-monit - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /opt/percona - name: bin - - args: - - /opt/percona/peer-list - - -on-change=/opt/percona/proxysql_add_proxysql_nodes.sh - - -service=$(PROXYSQL_SERVICE) - env: - - name: PROXYSQL_SERVICE - value: upgrade-proxysql-proxysql-unready - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-upgrade-proxysql - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-upgrade-proxysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-proxysql - envFrom: - - secretRef: - name: upgrade-proxysql-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql-monit - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /opt/percona - name: bin - dnsPolicy: ClusterFirst - initContainers: - - command: - - /pxc-init-entrypoint.sh - imagePullPolicy: Always - name: pxc-init - resources: - limits: - 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: - supplementalGroups: - - 1001 - serviceAccount: default - serviceAccountName: default - terminationGracePeriodSeconds: 30 - volumes: - - name: ssl-internal - secret: - defaultMode: 420 - optional: true - secretName: some-name-ssl-internal - - name: ssl - secret: - defaultMode: 420 - optional: false - secretName: some-name-ssl - - emptyDir: {} - name: bin - updateStrategy: - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: proxydata - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2G - status: - phase: Pending diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127.yml deleted file mode 100644 index 85ba99bea..000000000 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127.yml +++ /dev/null @@ -1,236 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 2 - name: upgrade-proxysql-proxysql - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: upgrade-proxysql -spec: - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - app.kubernetes.io/component: proxysql - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - serviceName: upgrade-proxysql-proxysql-unready - template: - metadata: - labels: - app.kubernetes.io/component: proxysql - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app.kubernetes.io/component: proxysql - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - topologyKey: kubernetes.io/hostname - containers: - - args: - - proxysql - - -f - - -c - - /etc/proxysql/proxysql.cnf - - --reload - command: - - /opt/percona/proxysql-entrypoint.sh - env: - - name: PXC_SERVICE - value: upgrade-proxysql-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-upgrade-proxysql - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-upgrade-proxysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-proxysql - envFrom: - - secretRef: - name: upgrade-proxysql-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 6032 - name: proxyadm - protocol: TCP - resources: - requests: - cpu: 600m - memory: 1G - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/proxysql - name: proxydata - - mountPath: /etc/proxysql/ssl - name: ssl - - mountPath: /etc/proxysql/ssl-internal - name: ssl-internal - - mountPath: /opt/percona - name: bin - - args: - - /opt/percona/peer-list - - -on-change=/opt/percona/proxysql_add_pxc_nodes.sh - - -service=$(PXC_SERVICE) - env: - - name: PXC_SERVICE - value: upgrade-proxysql-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-upgrade-proxysql - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-upgrade-proxysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-proxysql - envFrom: - - secretRef: - name: upgrade-proxysql-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: pxc-monit - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /opt/percona - name: bin - - args: - - /opt/percona/peer-list - - -on-change=/opt/percona/proxysql_add_proxysql_nodes.sh - - -service=$(PROXYSQL_SERVICE) - env: - - name: PROXYSQL_SERVICE - value: upgrade-proxysql-proxysql-unready - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-upgrade-proxysql - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-upgrade-proxysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-proxysql - envFrom: - - secretRef: - name: upgrade-proxysql-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql-monit - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /opt/percona - name: bin - dnsPolicy: ClusterFirst - initContainers: - - command: - - /pxc-init-entrypoint.sh - imagePullPolicy: Always - name: pxc-init - resources: - limits: - 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: - fsGroup: 1001 - supplementalGroups: - - 1001 - serviceAccount: default - serviceAccountName: default - terminationGracePeriodSeconds: 30 - volumes: - - name: ssl-internal - secret: - defaultMode: 420 - optional: true - secretName: some-name-ssl-internal - - name: ssl - secret: - defaultMode: 420 - optional: false - secretName: some-name-ssl - - emptyDir: {} - name: bin - updateStrategy: - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: proxydata - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2G - status: - phase: Pending diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-oc.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-oc.yml index 4ad887b1b..250720103 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-oc.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-oc.yml @@ -8,6 +8,9 @@ metadata: kind: PerconaXtraDBCluster name: upgrade-proxysql spec: + persistentVolumeClaimRetentionPolicy: + whenDeleted: Retain + whenScaled: Retain podManagementPolicy: OrderedReady replicas: 3 revisionHistoryLimit: 10 @@ -221,6 +224,12 @@ spec: type: RollingUpdate volumeClaimTemplates: - metadata: + labels: + app.kubernetes.io/component: proxysql + app.kubernetes.io/instance: upgrade-proxysql + app.kubernetes.io/managed-by: percona-xtradb-cluster-operator + app.kubernetes.io/name: percona-xtradb-cluster + app.kubernetes.io/part-of: percona-xtradb-cluster name: proxydata spec: accessModes: diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml index 998fb3a57..35250906a 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml @@ -8,6 +8,9 @@ metadata: kind: PerconaXtraDBCluster name: upgrade-proxysql spec: + persistentVolumeClaimRetentionPolicy: + whenDeleted: Retain + whenScaled: Retain podManagementPolicy: OrderedReady replicas: 3 revisionHistoryLimit: 10 @@ -40,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: upgrade-proxysql-pxc - name: OPERATOR_PASSWORD @@ -214,6 +225,12 @@ spec: type: RollingUpdate volumeClaimTemplates: - metadata: + labels: + app.kubernetes.io/component: proxysql + app.kubernetes.io/instance: upgrade-proxysql + app.kubernetes.io/managed-by: percona-xtradb-cluster-operator + app.kubernetes.io/name: percona-xtradb-cluster + app.kubernetes.io/part-of: percona-xtradb-cluster name: proxydata spec: accessModes: diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127-oc.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127-oc.yml deleted file mode 100644 index eae6955b5..000000000 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127-oc.yml +++ /dev/null @@ -1,279 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 2 - name: upgrade-proxysql-pxc - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: upgrade-proxysql -spec: - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - serviceName: upgrade-proxysql-pxc - template: - metadata: - labels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - topologyKey: kubernetes.io/hostname - containers: - - env: - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: POD_NAMESPASE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - - name: POD_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.name - envFrom: - - secretRef: - name: upgrade-proxysql-log-collector - optional: true - imagePullPolicy: Always - name: logs - resources: - requests: - cpu: 200m - memory: 100M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - args: - - logrotate - env: - - name: SERVICE_TYPE - value: mysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-proxysql - imagePullPolicy: Always - name: logrotate - resources: - requests: - cpu: 200m - memory: 100M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - args: - - mysqld - command: - - /var/lib/mysql/pxc-entrypoint.sh - env: - - name: PXC_SERVICE - value: upgrade-proxysql-pxc-unready - - name: MONITOR_HOST - value: '%' - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: root - name: internal-upgrade-proxysql - - name: XTRABACKUP_PASSWORD - valueFrom: - secretKeyRef: - key: xtrabackup - name: internal-upgrade-proxysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-proxysql - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: IS_LOGCOLLECTOR - value: "yes" - - name: OPERATOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-upgrade-proxysql - - name: LIVENESS_CHECK_TIMEOUT - value: "5" - - name: READINESS_CHECK_TIMEOUT - 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: upgrade-proxysql-env-vars-pxc - optional: true - imagePullPolicy: Always - livenessProbe: - exec: - command: - - /var/lib/mysql/liveness-check.sh - failureThreshold: 3 - initialDelaySeconds: 300 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 5 - name: pxc - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 4444 - name: sst - protocol: TCP - - containerPort: 4567 - name: write-set - protocol: TCP - - containerPort: 4568 - name: ist - protocol: TCP - - containerPort: 33062 - name: mysql-admin - protocol: TCP - - containerPort: 33060 - name: mysqlx - protocol: TCP - readinessProbe: - exec: - command: - - /var/lib/mysql/readiness-check.sh - failureThreshold: 5 - initialDelaySeconds: 15 - periodSeconds: 30 - successThreshold: 1 - timeoutSeconds: 15 - resources: - requests: - cpu: 600m - memory: 1G - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - mountPath: /etc/percona-xtradb-cluster.conf.d - name: config - - mountPath: /tmp - name: tmp - - mountPath: /etc/mysql/ssl - name: ssl - - mountPath: /etc/mysql/ssl-internal - name: ssl-internal - - mountPath: /etc/mysql/mysql-users-secret - name: mysql-users-secret-file - - mountPath: /etc/my.cnf.d - 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: - - /pxc-init-entrypoint.sh - imagePullPolicy: Always - name: pxc-init - resources: - limits: - cpu: 50m - memory: 50M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - restartPolicy: Always - schedulerName: default-scheduler - securityContext: - supplementalGroups: - - 1001 - serviceAccount: default - serviceAccountName: default - terminationGracePeriodSeconds: 600 - volumes: - - emptyDir: {} - name: tmp - - configMap: - defaultMode: 420 - name: upgrade-proxysql-pxc - optional: true - name: config - - name: ssl-internal - secret: - defaultMode: 420 - optional: true - secretName: some-name-ssl-internal - - name: ssl - secret: - defaultMode: 420 - optional: false - secretName: some-name-ssl - - configMap: - defaultMode: 420 - name: auto-upgrade-proxysql-pxc - optional: true - name: auto-config - - name: vault-keyring-secret - secret: - defaultMode: 420 - optional: true - secretName: some-name-vault - - name: mysql-users-secret-file - secret: - defaultMode: 420 - optional: false - secretName: internal-upgrade-proxysql - - name: mysql-init-file - secret: - defaultMode: 420 - optional: true - secretName: upgrade-proxysql-mysql-init - updateStrategy: - type: OnDelete - volumeClaimTemplates: - - metadata: - name: datadir - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 6G - status: - phase: Pending diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127.yml deleted file mode 100644 index bcc4bb49b..000000000 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127.yml +++ /dev/null @@ -1,280 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 2 - name: upgrade-proxysql-pxc - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: upgrade-proxysql -spec: - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - serviceName: upgrade-proxysql-pxc - template: - metadata: - labels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app.kubernetes.io/component: pxc - app.kubernetes.io/instance: upgrade-proxysql - app.kubernetes.io/managed-by: percona-xtradb-cluster-operator - app.kubernetes.io/name: percona-xtradb-cluster - app.kubernetes.io/part-of: percona-xtradb-cluster - topologyKey: kubernetes.io/hostname - containers: - - env: - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: POD_NAMESPASE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - - name: POD_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.name - envFrom: - - secretRef: - name: upgrade-proxysql-log-collector - optional: true - imagePullPolicy: Always - name: logs - resources: - requests: - cpu: 200m - memory: 100M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - args: - - logrotate - env: - - name: SERVICE_TYPE - value: mysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-proxysql - imagePullPolicy: Always - name: logrotate - resources: - requests: - cpu: 200m - memory: 100M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - args: - - mysqld - command: - - /var/lib/mysql/pxc-entrypoint.sh - env: - - name: PXC_SERVICE - value: upgrade-proxysql-pxc-unready - - name: MONITOR_HOST - value: '%' - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: root - name: internal-upgrade-proxysql - - name: XTRABACKUP_PASSWORD - valueFrom: - secretKeyRef: - key: xtrabackup - name: internal-upgrade-proxysql - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-upgrade-proxysql - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: IS_LOGCOLLECTOR - value: "yes" - - name: OPERATOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-upgrade-proxysql - - name: LIVENESS_CHECK_TIMEOUT - value: "5" - - name: READINESS_CHECK_TIMEOUT - 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: upgrade-proxysql-env-vars-pxc - optional: true - imagePullPolicy: Always - livenessProbe: - exec: - command: - - /var/lib/mysql/liveness-check.sh - failureThreshold: 3 - initialDelaySeconds: 300 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 5 - name: pxc - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 4444 - name: sst - protocol: TCP - - containerPort: 4567 - name: write-set - protocol: TCP - - containerPort: 4568 - name: ist - protocol: TCP - - containerPort: 33062 - name: mysql-admin - protocol: TCP - - containerPort: 33060 - name: mysqlx - protocol: TCP - readinessProbe: - exec: - command: - - /var/lib/mysql/readiness-check.sh - failureThreshold: 5 - initialDelaySeconds: 15 - periodSeconds: 30 - successThreshold: 1 - timeoutSeconds: 15 - resources: - requests: - cpu: 600m - memory: 1G - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - - mountPath: /etc/percona-xtradb-cluster.conf.d - name: config - - mountPath: /tmp - name: tmp - - mountPath: /etc/mysql/ssl - name: ssl - - mountPath: /etc/mysql/ssl-internal - name: ssl-internal - - mountPath: /etc/mysql/mysql-users-secret - name: mysql-users-secret-file - - mountPath: /etc/my.cnf.d - 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: - - /pxc-init-entrypoint.sh - imagePullPolicy: Always - name: pxc-init - resources: - limits: - cpu: 50m - memory: 50M - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/mysql - name: datadir - restartPolicy: Always - schedulerName: default-scheduler - securityContext: - fsGroup: 1001 - supplementalGroups: - - 1001 - serviceAccount: default - serviceAccountName: default - terminationGracePeriodSeconds: 600 - volumes: - - emptyDir: {} - name: tmp - - configMap: - defaultMode: 420 - name: upgrade-proxysql-pxc - optional: true - name: config - - name: ssl-internal - secret: - defaultMode: 420 - optional: true - secretName: some-name-ssl-internal - - name: ssl - secret: - defaultMode: 420 - optional: false - secretName: some-name-ssl - - configMap: - defaultMode: 420 - name: auto-upgrade-proxysql-pxc - optional: true - name: auto-config - - name: vault-keyring-secret - secret: - defaultMode: 420 - optional: true - secretName: some-name-vault - - name: mysql-users-secret-file - secret: - defaultMode: 420 - optional: false - secretName: internal-upgrade-proxysql - - name: mysql-init-file - secret: - defaultMode: 420 - optional: true - secretName: upgrade-proxysql-mysql-init - updateStrategy: - type: OnDelete - volumeClaimTemplates: - - metadata: - name: datadir - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 6G - status: - phase: Pending diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-oc.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-oc.yml index 717caf26c..8d71c22e5 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-oc.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-oc.yml @@ -8,6 +8,9 @@ metadata: kind: PerconaXtraDBCluster name: upgrade-proxysql spec: + persistentVolumeClaimRetentionPolicy: + whenDeleted: Retain + whenScaled: Retain podManagementPolicy: OrderedReady replicas: 3 revisionHistoryLimit: 10 @@ -265,6 +268,12 @@ spec: type: OnDelete volumeClaimTemplates: - metadata: + labels: + app.kubernetes.io/component: pxc + app.kubernetes.io/instance: upgrade-proxysql + app.kubernetes.io/managed-by: percona-xtradb-cluster-operator + app.kubernetes.io/name: percona-xtradb-cluster + app.kubernetes.io/part-of: percona-xtradb-cluster name: datadir spec: accessModes: diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc.yml index 7c9b8a592..925167d35 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc.yml @@ -8,6 +8,9 @@ metadata: kind: PerconaXtraDBCluster name: upgrade-proxysql spec: + persistentVolumeClaimRetentionPolicy: + whenDeleted: Retain + whenScaled: Retain podManagementPolicy: OrderedReady replicas: 3 revisionHistoryLimit: 10 @@ -266,6 +269,12 @@ spec: type: OnDelete volumeClaimTemplates: - metadata: + labels: + app.kubernetes.io/component: pxc + app.kubernetes.io/instance: upgrade-proxysql + app.kubernetes.io/managed-by: percona-xtradb-cluster-operator + app.kubernetes.io/name: percona-xtradb-cluster + app.kubernetes.io/part-of: percona-xtradb-cluster name: datadir spec: accessModes: