diff --git a/e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1140.yml b/e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1141.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1140.yml rename to e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1141.yml diff --git a/e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1150.yml b/e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1151.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1150.yml rename to e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1151.yml diff --git a/e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1140.yml b/e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1141.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1140.yml rename to e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1141.yml diff --git a/e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1150.yml b/e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1151.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1150.yml rename to e2e-tests/upgrade-consistency/compare/service_some-name-pxc-1151.yml diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-oc.yml deleted file mode 100644 index 24f7285354..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-oc.yml +++ /dev/null @@ -1,208 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 2 - name: some-name-proxysql - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - podManagementPolicy: OrderedReady - replicas: 2 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-proxysql-unready - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - topologyKey: kubernetes.io/hostname - containers: - - env: - - name: PXC_SERVICE - value: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 6032 - name: proxyadm - protocol: TCP - resources: - limits: - cpu: 700m - memory: 1G - requests: - cpu: 100m - memory: 100M - 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 - - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_pxc_nodes.sh - - -service=$(PXC_SERVICE) - env: - - name: PXC_SERVICE - value: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: pxc-monit - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_proxysql_nodes.sh - - -service=$(PROXYSQL_SERVICE) - env: - - name: PROXYSQL_SERVICE - value: some-name-proxysql-unready - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql-monit - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: 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: 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: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: proxydata - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140.yml deleted file mode 100644 index fe83b3736b..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140.yml +++ /dev/null @@ -1,209 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 3 - name: some-name-proxysql - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - podManagementPolicy: OrderedReady - replicas: 2 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-proxysql-unready - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - topologyKey: kubernetes.io/hostname - containers: - - env: - - name: PXC_SERVICE - value: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 6032 - name: proxyadm - protocol: TCP - resources: - limits: - cpu: 700m - memory: 1G - requests: - cpu: 100m - memory: 100m - 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 - - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_pxc_nodes.sh - - -service=$(PXC_SERVICE) - env: - - name: PXC_SERVICE - value: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: pxc-monit - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - - args: - - /usr/bin/peer-list - - -on-change=/usr/bin/add_proxysql_nodes.sh - - -service=$(PROXYSQL_SERVICE) - env: - - name: PROXYSQL_SERVICE - value: some-name-proxysql-unready - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql-monit - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: 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: 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: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: proxydata - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1141-oc.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127-oc.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1141-oc.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-1141.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1141.yml diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150-oc.yml deleted file mode 100644 index 7700138edd..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150-oc.yml +++ /dev/null @@ -1,237 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 3 - name: some-name-proxysql - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - podManagementPolicy: OrderedReady - replicas: 2 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-proxysql-unready - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - 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: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 6032 - name: proxyadm - protocol: TCP - resources: - limits: - cpu: 700m - memory: 1G - requests: - cpu: 100m - memory: 100M - 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: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-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: some-name-proxysql-unready - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-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: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: proxydata - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150.yml deleted file mode 100644 index 9df069f53f..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150.yml +++ /dev/null @@ -1,230 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 4 - name: some-name-proxysql - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - podManagementPolicy: OrderedReady - replicas: 2 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-proxysql-unready - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - topologyKey: kubernetes.io/hostname - containers: - - env: - - name: PXC_SERVICE - value: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 6032 - name: proxyadm - protocol: TCP - resources: - limits: - cpu: 700m - memory: 1G - requests: - cpu: 100m - memory: 100m - 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: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-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: some-name-proxysql-unready - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-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: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: proxydata - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150-k127-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1151-oc.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150-k127-oc.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1151-oc.yml 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-1151.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150-k127.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1151.yml diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127-oc.yml deleted file mode 100644 index 43a9e27175..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127-oc.yml +++ /dev/null @@ -1,240 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 3 - name: some-name-proxysql - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - podManagementPolicy: OrderedReady - replicas: 2 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-proxysql-unready - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - 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: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 6032 - name: proxyadm - protocol: TCP - resources: - limits: - cpu: 700m - memory: 1G - requests: - cpu: 100m - memory: 100M - 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: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-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: some-name-proxysql-unready - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-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: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: proxydata - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127.yml deleted file mode 100644 index fd94e821f1..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1160-k127.yml +++ /dev/null @@ -1,241 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 3 - name: some-name-proxysql - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - podManagementPolicy: OrderedReady - replicas: 2 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-proxysql-unready - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - 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: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-env-vars-proxysql - optional: true - imagePullPolicy: Always - name: proxysql - ports: - - containerPort: 3306 - name: mysql - protocol: TCP - - containerPort: 6032 - name: proxyadm - protocol: TCP - resources: - limits: - cpu: 700m - memory: 1G - requests: - cpu: 100m - memory: 100M - 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: some-name-pxc - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-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: some-name-proxysql-unready - - name: OPERATOR_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: PROXY_ADMIN_USER - value: proxyadmin - - name: PROXY_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: proxyadmin - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - envFrom: - - secretRef: - name: some-name-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: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: proxydata - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending 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 index 7700138edd..43a9e27175 100644 --- 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 @@ -8,6 +8,9 @@ metadata: kind: PerconaXtraDBCluster name: some-name spec: + persistentVolumeClaimRetentionPolicy: + whenDeleted: Retain + whenScaled: Retain podManagementPolicy: OrderedReady replicas: 2 revisionHistoryLimit: 10 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 index 9df069f53f..fd94e821f1 100644 --- 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,13 +1,16 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 4 + generation: 3 name: some-name-proxysql ownerReferences: - controller: true kind: PerconaXtraDBCluster name: some-name spec: + persistentVolumeClaimRetentionPolicy: + whenDeleted: Retain + whenScaled: Retain podManagementPolicy: OrderedReady replicas: 2 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: some-name-pxc - name: OPERATOR_PASSWORD @@ -79,7 +90,7 @@ spec: memory: 1G requests: cpu: 100m - memory: 100m + memory: 100M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-oc.yml deleted file mode 100644 index b243034382..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-oc.yml +++ /dev/null @@ -1,271 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 2 - name: some-name-pxc - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-pxc - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - 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: some-name-log-collector - optional: true - imagePullPolicy: Always - name: logs - resources: {} - 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-some-name - imagePullPolicy: Always - name: logrotate - resources: {} - 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: some-name-pxc-unready - - name: MONITOR_HOST - value: '%' - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: root - name: internal-some-name - - name: XTRABACKUP_PASSWORD - valueFrom: - secretKeyRef: - key: xtrabackup - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: IS_LOGCOLLECTOR - value: "yes" - - name: OPERATOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: LIVENESS_CHECK_TIMEOUT - value: "5" - - name: READINESS_CHECK_TIMEOUT - value: "15" - - name: DEFAULT_AUTHENTICATION_PLUGIN - value: mysql_native_password - envFrom: - - secretRef: - name: some-name-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: - limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M - 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: some-name-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-some-name-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-some-name - - name: mysql-init-file - secret: - defaultMode: 420 - optional: true - secretName: some-name-mysql-init - updateStrategy: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: datadir - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140.yml deleted file mode 100644 index a361e12462..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140.yml +++ /dev/null @@ -1,272 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 3 - name: some-name-pxc - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-pxc - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - 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: some-name-log-collector - optional: true - imagePullPolicy: Always - name: logs - resources: {} - 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-some-name - imagePullPolicy: Always - name: logrotate - resources: {} - 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: some-name-pxc-unready - - name: MONITOR_HOST - value: '%' - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: root - name: internal-some-name - - name: XTRABACKUP_PASSWORD - valueFrom: - secretKeyRef: - key: xtrabackup - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: IS_LOGCOLLECTOR - value: "yes" - - name: OPERATOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: LIVENESS_CHECK_TIMEOUT - value: "5" - - name: READINESS_CHECK_TIMEOUT - value: "15" - - name: DEFAULT_AUTHENTICATION_PLUGIN - value: mysql_native_password - envFrom: - - secretRef: - name: some-name-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: - limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M - 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: some-name-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-some-name-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-some-name - - name: mysql-init-file - secret: - defaultMode: 420 - optional: true - secretName: some-name-mysql-init - updateStrategy: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: datadir - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1141-oc.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127-oc.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1141-oc.yml 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-1141.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1141.yml diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-oc.yml deleted file mode 100644 index 1973f5f996..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-oc.yml +++ /dev/null @@ -1,271 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 3 - name: some-name-pxc - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-pxc - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - 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: some-name-log-collector - optional: true - imagePullPolicy: Always - name: logs - resources: {} - 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-some-name - imagePullPolicy: Always - name: logrotate - resources: {} - 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: some-name-pxc-unready - - name: MONITOR_HOST - value: '%' - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: root - name: internal-some-name - - name: XTRABACKUP_PASSWORD - valueFrom: - secretKeyRef: - key: xtrabackup - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: IS_LOGCOLLECTOR - value: "yes" - - name: OPERATOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: LIVENESS_CHECK_TIMEOUT - value: "5" - - name: READINESS_CHECK_TIMEOUT - value: "15" - - name: DEFAULT_AUTHENTICATION_PLUGIN - value: mysql_native_password - envFrom: - - secretRef: - name: some-name-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: - limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M - 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: some-name-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-some-name-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-some-name - - name: mysql-init-file - secret: - defaultMode: 420 - optional: true - secretName: some-name-mysql-init - updateStrategy: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: datadir - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150.yml deleted file mode 100644 index 8fea3e88a2..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150.yml +++ /dev/null @@ -1,272 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 4 - name: some-name-pxc - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-pxc - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - 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: some-name-log-collector - optional: true - imagePullPolicy: Always - name: logs - resources: {} - 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-some-name - imagePullPolicy: Always - name: logrotate - resources: {} - 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: some-name-pxc-unready - - name: MONITOR_HOST - value: '%' - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: root - name: internal-some-name - - name: XTRABACKUP_PASSWORD - valueFrom: - secretKeyRef: - key: xtrabackup - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: IS_LOGCOLLECTOR - value: "yes" - - name: OPERATOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: LIVENESS_CHECK_TIMEOUT - value: "5" - - name: READINESS_CHECK_TIMEOUT - value: "15" - - name: DEFAULT_AUTHENTICATION_PLUGIN - value: mysql_native_password - envFrom: - - secretRef: - name: some-name-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: - limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M - 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: some-name-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-some-name-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-some-name - - name: mysql-init-file - secret: - defaultMode: 420 - optional: true - secretName: some-name-mysql-init - updateStrategy: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: datadir - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1151-oc.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127-oc.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1151-oc.yml 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-1151.yml similarity index 100% rename from e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1150-k127.yml rename to e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1151.yml diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127-oc.yml deleted file mode 100644 index 97a6c7d61b..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127-oc.yml +++ /dev/null @@ -1,278 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 3 - name: some-name-pxc - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-pxc - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - 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: some-name-log-collector - optional: true - imagePullPolicy: Always - name: logs - resources: {} - 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-some-name - imagePullPolicy: Always - name: logrotate - resources: {} - 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: some-name-pxc-unready - - name: MONITOR_HOST - value: '%' - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: root - name: internal-some-name - - name: XTRABACKUP_PASSWORD - valueFrom: - secretKeyRef: - key: xtrabackup - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: IS_LOGCOLLECTOR - value: "yes" - - name: OPERATOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: LIVENESS_CHECK_TIMEOUT - value: "5" - - name: READINESS_CHECK_TIMEOUT - value: "15" - - name: DEFAULT_AUTHENTICATION_PLUGIN - value: mysql_native_password - - name: 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 - 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: - limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M - 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: some-name-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-some-name-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-some-name - - name: mysql-init-file - secret: - defaultMode: 420 - optional: true - secretName: some-name-mysql-init - updateStrategy: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: datadir - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127.yml deleted file mode 100644 index 8c782a17ae..0000000000 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1160-k127.yml +++ /dev/null @@ -1,279 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - generation: 3 - name: some-name-pxc - ownerReferences: - - controller: true - kind: PerconaXtraDBCluster - name: some-name -spec: - persistentVolumeClaimRetentionPolicy: - whenDeleted: Retain - whenScaled: Retain - podManagementPolicy: OrderedReady - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - 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 - serviceName: some-name-pxc - template: - metadata: - labels: - 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 - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - 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 - 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: some-name-log-collector - optional: true - imagePullPolicy: Always - name: logs - resources: {} - 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-some-name - imagePullPolicy: Always - name: logrotate - resources: {} - 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: some-name-pxc-unready - - name: MONITOR_HOST - value: '%' - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: root - name: internal-some-name - - name: XTRABACKUP_PASSWORD - valueFrom: - secretKeyRef: - key: xtrabackup - name: internal-some-name - - name: MONITOR_PASSWORD - valueFrom: - secretKeyRef: - key: monitor - name: internal-some-name - - name: LOG_DATA_DIR - value: /var/lib/mysql - - name: IS_LOGCOLLECTOR - value: "yes" - - name: OPERATOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - key: operator - name: internal-some-name - - name: LIVENESS_CHECK_TIMEOUT - value: "5" - - name: READINESS_CHECK_TIMEOUT - value: "15" - - name: DEFAULT_AUTHENTICATION_PLUGIN - value: mysql_native_password - - name: 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 - 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: - limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M - 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: some-name-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-some-name-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-some-name - - name: mysql-init-file - secret: - defaultMode: 420 - optional: true - secretName: some-name-mysql-init - updateStrategy: - rollingUpdate: - partition: 0 - type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: datadir - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - status: - phase: Pending 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 index 3bd128f331..97a6c7d61b 100644 --- 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 @@ -8,6 +8,9 @@ metadata: kind: PerconaXtraDBCluster name: some-name spec: + persistentVolumeClaimRetentionPolicy: + whenDeleted: Retain + whenScaled: Retain podManagementPolicy: OrderedReady replicas: 3 revisionHistoryLimit: 10 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 index 8922755ce7..8c782a17ae 100644 --- 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,13 +1,16 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 4 + generation: 3 name: some-name-pxc ownerReferences: - controller: true kind: PerconaXtraDBCluster name: some-name spec: + persistentVolumeClaimRetentionPolicy: + whenDeleted: Retain + whenScaled: Retain podManagementPolicy: OrderedReady replicas: 3 revisionHistoryLimit: 10 diff --git a/e2e-tests/upgrade-consistency/run b/e2e-tests/upgrade-consistency/run index 0d61042238..5372faa4f6 100755 --- a/e2e-tests/upgrade-consistency/run +++ b/e2e-tests/upgrade-consistency/run @@ -38,32 +38,32 @@ main() { kubectl_bin apply \ -f "$test_dir/conf/secrets.yml" cat_config "$conf_dir/$cluster.yml" \ - | yq eval '.spec.crVersion = "1.14.0"' - \ + | yq eval '.spec.crVersion = "1.14.1"' - \ | kubectl_bin apply -f - - desc "test 1.14.0" + desc "test 1.14.1" kubectl_bin patch pxc "$cluster" --type=merge --patch '{ - "spec": {"crVersion":"1.14.0"} + "spec": {"crVersion":"1.14.1"} }' wait_cluster_consistency "$cluster" 3 2 wait_for_sts_generation "$cluster-pxc" "1" "1" desc "compare k8s objects" - compare_kubectl service/$cluster-pxc "-1140" - compare_kubectl service/$cluster-proxysql "-1140" - compare_kubectl statefulset/$cluster-pxc "-1140" - compare_kubectl statefulset/$cluster-proxysql "-1140" + compare_kubectl service/$cluster-pxc "-1141" + compare_kubectl service/$cluster-proxysql "-1141" + compare_kubectl statefulset/$cluster-pxc "-1141" + compare_kubectl statefulset/$cluster-proxysql "-1141" - desc "test 1.15.0" + desc "test 1.15.1" kubectl_bin patch pxc "$cluster" --type=merge --patch '{ - "spec": {"crVersion":"1.15.0"} + "spec": {"crVersion":"1.15.1"} }' wait_cluster_consistency "$cluster" 3 2 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" + compare_kubectl service/$cluster-pxc "-1151" + compare_kubectl service/$cluster-proxysql "-1151" + compare_kubectl statefulset/$cluster-pxc "-1151" + compare_kubectl statefulset/$cluster-proxysql "-1151" desc "test 1.16.0" kubectl_bin patch pxc "$cluster" --type=merge --patch '{