K8SPSMDB-886 - Post 1.15.0 release update

percona · Oct 9, 2023 · cf2fecb · cf2fecb
1 parent ac63777
commit cf2fecb
Show file tree

Hide file tree

Showing 30 changed files with 117 additions and 75 deletions.
diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -17603,7 +17603,7 @@ spec:
       serviceAccountName: percona-server-mongodb-operator
       containers:
         - name: percona-server-mongodb-operator
-          image: percona/percona-server-mongodb-operator:1.15.0
+          image: perconalab/percona-server-mongodb-operator:main
           ports:
           - containerPort: 60000
             protocol: TCP

diff --git a/deploy/cr-minimal.yaml b/deploy/cr-minimal.yaml
@@ -3,8 +3,8 @@ kind: PerconaServerMongoDB
 metadata:
   name: minimal-cluster
 spec:
-  crVersion: 1.15.0
-  image: percona/percona-server-mongodb:6.0.9-7
+  crVersion: 1.16.0
+  image: perconalab/percona-server-mongodb-operator:main-mongod6.0
   allowUnsafeConfigurations: true
   upgradeOptions:
     apply: disabled

diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -11,8 +11,8 @@ spec:
 #  clusterServiceDNSMode: "Internal"
 #  pause: true
 #  unmanaged: false
-  crVersion: 1.15.0
-  image: percona/percona-server-mongodb:6.0.9-7
+  crVersion: 1.16.0
+  image: perconalab/percona-server-mongodb-operator:main-mongod6.0
   imagePullPolicy: Always
 #  tls:
 #    # 90 days in hours
@@ -41,7 +41,7 @@ spec:
 #    vault: my-cluster-name-vault
   pmm:
     enabled: false
-    image: percona/pmm-client:2.39.0
+    image: perconalab/pmm-client:dev-latest
     serverHost: monitoring-service
 #    mongodParams: --environment=ENVIRONMENT
 #    mongosParams: --environment=ENVIRONMENT
@@ -500,7 +500,7 @@ spec:
 
   backup:
     enabled: true
-    image: percona/percona-backup-mongodb:2.3.0
+    image: perconalab/percona-server-mongodb-operator:main-backup
     serviceAccountName: percona-server-mongodb-operator
 #    annotations:
 #      iam.amazonaws.com/role: role-arn

diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -17616,7 +17616,7 @@ spec:
       serviceAccountName: percona-server-mongodb-operator
       containers:
         - name: percona-server-mongodb-operator
-          image: percona/percona-server-mongodb-operator:1.15.0
+          image: perconalab/percona-server-mongodb-operator:main
           ports:
           - containerPort: 60000
             protocol: TCP

diff --git a/deploy/cw-operator.yaml b/deploy/cw-operator.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: percona-server-mongodb-operator
       containers:
         - name: percona-server-mongodb-operator
-          image: percona/percona-server-mongodb-operator:1.15.0
+          image: perconalab/percona-server-mongodb-operator:main
           ports:
           - containerPort: 60000
             protocol: TCP

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: percona-server-mongodb-operator
       containers:
         - name: percona-server-mongodb-operator
-          image: percona/percona-server-mongodb-operator:1.15.0
+          image: perconalab/percona-server-mongodb-operator:main
           ports:
           - containerPort: 60000
             protocol: TCP

diff --git a/...cy/compare/service_some-name-rs0-1130.yml → ...ed/compare/service_some-name-rs0-1160.yml b/...cy/compare/service_some-name-rs0-1130.yml → ...ed/compare/service_some-name-rs0-1160.yml
diff --git a/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1140-oc.yml b/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1140-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 2
+  generation: 1
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1140.yml b/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1140.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 2
+  generation: 1
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1150-oc.yml b/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1150-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 2
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1150.yml b/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1150.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 2
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name

diff --git a/...are/statefulset_some-name-cfg-1130-oc.yml → ...are/statefulset_some-name-cfg-1160-oc.yml b/...are/statefulset_some-name-cfg-1130-oc.yml → ...are/statefulset_some-name-cfg-1160-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 1
+  generation: 3
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name
@@ -56,7 +56,7 @@ spec:
             - --wiredTigerIndexPrefixCompression=true
             - --config=/etc/mongodb-config/mongod.conf
           command:
-            - /data/db/ps-entry.sh
+            - /opt/percona/ps-entry.sh
           env:
             - name: SERVICE_NAME
               value: some-name
@@ -72,7 +72,7 @@ spec:
           livenessProbe:
             exec:
               command:
-                - /data/db/mongodb-healthcheck
+                - /opt/percona/mongodb-healthcheck
                 - k8s
                 - liveness
                 - --ssl
@@ -94,12 +94,17 @@ spec:
               name: mongodb
               protocol: TCP
           readinessProbe:
+            exec:
+              command:
+                - /opt/percona/mongodb-healthcheck
+                - k8s
+                - readiness
+                - --component
+                - mongod
             failureThreshold: 8
             initialDelaySeconds: 10
             periodSeconds: 3
             successThreshold: 1
-            tcpSocket:
-              port: 27017
             timeoutSeconds: 2
           resources:
             limits:
@@ -126,6 +131,8 @@ spec:
               readOnly: true
             - mountPath: /etc/mongodb-config
               name: config
+            - mountPath: /opt/percona
+              name: bin
             - mountPath: /etc/mongodb-encryption
               name: some-name-mongodb-encryption-key
               readOnly: true
@@ -157,7 +164,7 @@ spec:
       securityContext: {}
       serviceAccount: default
       serviceAccountName: default
-      terminationGracePeriodSeconds: 30
+      terminationGracePeriodSeconds: 60
       volumes:
         - name: some-name-mongodb-keyfile
           secret:

diff --git a/...ompare/statefulset_some-name-cfg-1130.yml → ...ompare/statefulset_some-name-cfg-1160.yml b/...ompare/statefulset_some-name-cfg-1130.yml → ...ompare/statefulset_some-name-cfg-1160.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 1
+  generation: 3
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name
@@ -68,7 +68,7 @@ spec:
             - --wiredTigerCacheSizeGB=0.25
             - --wiredTigerIndexPrefixCompression=true
           command:
-            - /data/db/ps-entry.sh
+            - /opt/percona/ps-entry.sh
           env:
             - name: SERVICE_NAME
               value: some-name
@@ -84,7 +84,7 @@ spec:
           livenessProbe:
             exec:
               command:
-                - /data/db/mongodb-healthcheck
+                - /opt/percona/mongodb-healthcheck
                 - k8s
                 - liveness
                 - --ssl
@@ -106,12 +106,17 @@ spec:
               name: mongodb
               protocol: TCP
           readinessProbe:
+            exec:
+              command:
+                - /opt/percona/mongodb-healthcheck
+                - k8s
+                - readiness
+                - --component
+                - mongod
             failureThreshold: 3
             initialDelaySeconds: 10
             periodSeconds: 3
             successThreshold: 1
-            tcpSocket:
-              port: 27017
             timeoutSeconds: 2
           resources:
             limits:
@@ -137,6 +142,8 @@ spec:
             - mountPath: /etc/mongodb-ssl-internal
               name: ssl-internal
               readOnly: true
+            - mountPath: /opt/percona
+              name: bin
             - mountPath: /etc/mongodb-encryption
               name: some-name-mongodb-encryption-key
               readOnly: true
@@ -169,7 +176,7 @@ spec:
         fsGroup: 1001
       serviceAccount: default
       serviceAccountName: default
-      terminationGracePeriodSeconds: 30
+      terminationGracePeriodSeconds: 60
       volumes:
         - name: some-name-mongodb-keyfile
           secret:

diff --git a/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1140-oc.yml b/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1140-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 2
+  generation: 1
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1140.yml b/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1140.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 2
+  generation: 1
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1150-oc.yml b/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1150-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 2
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1150.yml b/e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1150.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 2
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

diff --git a/...are/statefulset_some-name-rs0-1130-oc.yml → ...are/statefulset_some-name-rs0-1160-oc.yml b/...are/statefulset_some-name-rs0-1130-oc.yml → ...are/statefulset_some-name-rs0-1160-oc.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 1
+  generation: 3
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name
@@ -56,7 +56,7 @@ spec:
             - --wiredTigerIndexPrefixCompression=true
             - --config=/etc/mongodb-config/mongod.conf
           command:
-            - /data/db/ps-entry.sh
+            - /opt/percona/ps-entry.sh
           env:
             - name: SERVICE_NAME
               value: some-name
@@ -72,7 +72,7 @@ spec:
           livenessProbe:
             exec:
               command:
-                - /data/db/mongodb-healthcheck
+                - /opt/percona/mongodb-healthcheck
                 - k8s
                 - liveness
                 - --ssl
@@ -94,12 +94,17 @@ spec:
               name: mongodb
               protocol: TCP
           readinessProbe:
+            exec:
+              command:
+                - /opt/percona/mongodb-healthcheck
+                - k8s
+                - readiness
+                - --component
+                - mongod
             failureThreshold: 8
             initialDelaySeconds: 10
             periodSeconds: 3
             successThreshold: 1
-            tcpSocket:
-              port: 27017
             timeoutSeconds: 2
           resources:
             limits:
@@ -126,6 +131,8 @@ spec:
               readOnly: true
             - mountPath: /etc/mongodb-config
               name: config
+            - mountPath: /opt/percona
+              name: bin
             - mountPath: /etc/mongodb-encryption
               name: some-name-mongodb-encryption-key
               readOnly: true
@@ -157,7 +164,7 @@ spec:
       securityContext: {}
       serviceAccount: default
       serviceAccountName: default
-      terminationGracePeriodSeconds: 30
+      terminationGracePeriodSeconds: 60
       volumes:
         - name: some-name-mongodb-keyfile
           secret: