K8SPG-613: replace initImage with initContainer

https://perconadev.atlassian.net/browse/K8SPG-613

Author: pooknull

build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml

@@ -10,7 +10,31 @@ metadata:
 #  - percona.com/delete-backups
 spec:
   crVersion: 2.7.0
-#  initImage: perconalab/percona-postgresql-operator:main
+#  initContainer:
+#    image: perconalab/percona-postgresql-operator:main
+#    resources:
+#      limits:
+#        cpu: 2.0
+#        memory: 4Gi
+#    containerSecurityContext:
+#      fsGroup: 1001
+#      runAsUser: 1001
+#      runAsNonRoot: true
+#      fsGroupChangePolicy: "OnRootMismatch"
+#      runAsGroup: 1001
+#      seLinuxOptions:
+#        type: spc_t
+#        level: s0:c123,c456
+#      seccompProfile:
+#        type: Localhost
+#        localhostProfile: localhost/profile.json
+#      supplementalGroups:
+#      - 1001
+#      sysctls:
+#      - name: net.ipv4.tcp_keepalive_time
+#        value: "600"
+#      - name: net.ipv4.tcp_keepalive_intvl
+#        value: "60"
 #  metadata:
 #    annotations:
 #      example-annotation: value
@@ -324,8 +348,31 @@ spec:
 #      metadata:
 #        labels:
       image: perconalab/percona-postgresql-operator:main-pgbackrest17
-#      initImage: perconalab/percona-postgresql-operator:main
-#
+#      initContainer:
+#        image: perconalab/percona-postgresql-operator:main
+#        resources:
+#          limits:
+#            cpu: 2.0
+#            memory: 4Gi
+#        containerSecurityContext:
+#          fsGroup: 1001
+#          runAsUser: 1001
+#          runAsNonRoot: true
+#          fsGroupChangePolicy: "OnRootMismatch"
+#          runAsGroup: 1001
+#          seLinuxOptions:
+#            type: spc_t
+#            level: s0:c123,c456
+#          seccompProfile:
+#            type: Localhost
+#            localhostProfile: localhost/profile.json
+#          supplementalGroups:
+#          - 1001
+#          sysctls:
+#          - name: net.ipv4.tcp_keepalive_time
+#            value: "600"
+#          - name: net.ipv4.tcp_keepalive_intvl
+#            value: "60"
 #      containers:
 #        pgbackrest:
 #          resources:

build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml

@@ -825,19 +825,42 @@ func generateBackupJobSpecIntent(ctx context.Context, postgresCluster *v1beta1.P
 		ImagePullPolicy: postgresCluster.Spec.ImagePullPolicy,
 		Name:            naming.PGBackRestRepoContainerName,
 		SecurityContext: initialize.RestrictedSecurityContext(postgresCluster.CompareVersion("2.5.0") >= 0), // K8SPG-260
-		// K8SPG-613
-		VolumeMounts: []corev1.VolumeMount{
-			{
-				Name:      pNaming.CrunchyBinVolumeName,
-				MountPath: pNaming.CrunchyBinVolumePath,
-			},
-		},
 	}
 
 	if postgresCluster.Spec.Backups.PGBackRest.Jobs != nil {
 		container.Resources = postgresCluster.Spec.Backups.PGBackRest.Jobs.Resources
 	}
 
+	// K8SPG-613
+	initContainers := []corev1.Container{}
+	volumes := []corev1.Volume{}
+	if postgresCluster.CompareVersion("2.7.0") >= 0 {
+		container.VolumeMounts = []corev1.VolumeMount{
+			{
+				Name:      pNaming.CrunchyBinVolumeName,
+				MountPath: pNaming.CrunchyBinVolumePath,
+			},
+		}
+		initContainers = []corev1.Container{
+			k8s.InitContainer(
+				naming.PGBackRestRepoContainerName,
+				initImage,
+				postgresCluster.Spec.ImagePullPolicy,
+				initialize.RestrictedSecurityContext(true),
+				container.Resources,
+				&postgresCluster.Spec.Backups.PGBackRest,
+			),
+		}
+		volumes = []corev1.Volume{
+			{
+				Name: pNaming.CrunchyBinVolumeName,
+				VolumeSource: corev1.VolumeSource{
+					EmptyDir: &corev1.EmptyDirVolumeSource{},
+				},
+			},
+		}
+	}
+
 	jobSpec := &batchv1.JobSpec{
 		Template: corev1.PodTemplateSpec{
 			ObjectMeta: metav1.ObjectMeta{Labels: labels, Annotations: annotations},
@@ -857,24 +880,9 @@ func generateBackupJobSpecIntent(ctx context.Context, postgresCluster *v1beta1.P
 				SecurityContext:    initialize.PodSecurityContext(),
 				ServiceAccountName: serviceAccountName,
 				// K8SPG-613
-				Volumes: []corev1.Volume{
-					{
-						Name: pNaming.CrunchyBinVolumeName,
-						VolumeSource: corev1.VolumeSource{
-							EmptyDir: &corev1.EmptyDirVolumeSource{},
-						},
-					},
-				},
+				Volumes: volumes,
 				// K8SPG-613
-				InitContainers: []corev1.Container{
-					k8s.InitContainer(
-						naming.PGBackRestRepoContainerName,
-						initImage,
-						postgresCluster.Spec.ImagePullPolicy,
-						initialize.RestrictedSecurityContext(postgresCluster.CompareVersion("2.5.0") >= 0),
-						container.Resources,
-					),
-				},
+				InitContainers: initContainers,
 			},
 		},
 	}

config/crd/bases/pgv2.percona.com_perconapgclusters.yaml

@@ -62,11 +62,15 @@ func fakePostgresCluster(clusterName, namespace, clusterUID string,
 			Port:            initialize.Int32(5432),
 			Shutdown:        initialize.Bool(false),
 			PostgresVersion: 13,
-			ImagePullSecrets: []corev1.LocalObjectReference{{
-				Name: "myImagePullSecret"},
+			ImagePullSecrets: []corev1.LocalObjectReference{
+				{
+					Name: "myImagePullSecret",
+				},
+			},
+			InitContainer: v1beta1.InitContainerSpec{
+				Image: "some-init-image",
 			},
-			InitImage: "some-init-image",
-			Image:     "example.com/crunchy-postgres-ha:test",
+			Image: "example.com/crunchy-postgres-ha:test",
 			InstanceSets: []v1beta1.PostgresInstanceSetSpec{{
 				Name: "instance1",
 				DataVolumeClaimSpec: corev1.PersistentVolumeClaimSpec{