Merge branch 'cherry-pick-452d6af1' into 'release/4.1'

Merge branch 'OWLS-111911' into 'main'

See merge request weblogic-cloud/weblogic-kubernetes-operator!4413

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/helpers/BasePodStepContext.java

@@ -156,7 +156,7 @@ protected V1Container createInitContainerForAuxiliaryImage(DeploymentImage auxil
             .command(Collections.singletonList(AUXILIARY_IMAGE_INIT_CONTAINER_WRAPPER_SCRIPT))
             .env(createEnv(auxiliaryImage, getName(index)))
             .resources(createResources())
-            .securityContext(getInitContainerSecurityContext())
+            .securityContext(PodSecurityHelper.getDefaultContainerSecurityContext())
             .volumeMounts(Arrays.asList(
                     new V1VolumeMount().name(AUXILIARY_IMAGE_INTERNAL_VOLUME_NAME)
                             .mountPath(AUXILIARY_IMAGE_TARGET_PATH),

operator/src/main/java/oracle/kubernetes/operator/helpers/JobStepContext.java

@@ -592,13 +592,17 @@ protected V1PodSpec createPodSpec() {
           podSpec.securityContext(podSecurityContext.fsGroup(podSecurityContext.getRunAsGroup()));
         } else if (podSecurityContext.getFsGroup() == null) {
           Optional.ofNullable(TuningParameters.getInstance()).ifPresent(instance -> {
-            if (!"OpenShift".equalsIgnoreCase(instance.getKubernetesPlatform())) {
+            if (!"OpenShift".equalsIgnoreCase(instance.getKubernetesPlatform()) && !isInitDomainOnPVRunAsRoot()) {
               podSpec.securityContext(podSecurityContext.fsGroup(0L));
             }
           });
         }
         if (podSpec.getSecurityContext().getFsGroupChangePolicy() == null) {
-          podSpec.getSecurityContext().fsGroupChangePolicy("OnRootMismatch");
+          Optional.ofNullable(TuningParameters.getInstance()).ifPresent(instance -> {
+            if (!"OpenShift".equalsIgnoreCase(instance.getKubernetesPlatform()) && !isInitDomainOnPVRunAsRoot()) {
+              podSpec.getSecurityContext().fsGroupChangePolicy("OnRootMismatch");
+            }
+          });
         }
       }
     }