Changes to move 'chmod -R g=u' in the introspector for MII domain instead of startServer.sh.

Author: ankedia

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

@@ -39,6 +39,8 @@
 
 public abstract class BasePodStepContext extends StepContextBase {
 
+  public static final String KUBERNETES_PLATFORM_SYSTEM_PROPERTY = "kubernetesPlatform";
+
   BasePodStepContext(DomainPresenceInfo info) {
     super(info);
   }

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

@@ -325,6 +325,9 @@ List<V1EnvVar> getConfiguredEnvVars(TuningParameters tuningParameters) {
       addEnvVar(vars, IntrospectorJobEnvVars.ISTIO_ENABLED, Boolean.toString(isIstioEnabled()));
       addEnvVar(vars, IntrospectorJobEnvVars.ADMIN_CHANNEL_PORT_FORWARDING_ENABLED,
               Boolean.toString(isAdminChannelPortForwardingEnabled(getDomain().getSpec())));
+      Optional.ofNullable(getKubernetesPlatform())
+              .ifPresent(v -> addEnvVar(vars, ServerEnvVars.KUBERNETES_PLATFORM, v));
+
       addEnvVar(vars, IntrospectorJobEnvVars.ISTIO_READINESS_PORT, Integer.toString(getIstioReadinessPort()));
       addEnvVar(vars, IntrospectorJobEnvVars.ISTIO_POD_NAMESPACE, getNamespace());
       if (isUseOnlineUpdate()) {
@@ -391,6 +394,10 @@ List<V1EnvVar> getConfiguredEnvVars(TuningParameters tuningParameters) {
       return vars;
     }
 
+    private String getKubernetesPlatform() {
+      return System.getProperty(KUBERNETES_PLATFORM_SYSTEM_PROPERTY);
+    }
+
   }
 
   static class DomainIntrospectorJobStep extends Step {

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

@@ -1081,7 +1081,7 @@ private boolean mockWls() {
   }
 
   private String getKubernetesPlatform() {
-    return System.getProperty("kubernetesPlatform");
+    return System.getProperty(KUBERNETES_PLATFORM_SYSTEM_PROPERTY);
   }
 
   private abstract class BaseStep extends Step {

operator/src/main/resources/scripts/introspectDomain.py

@@ -905,6 +905,10 @@ def generate(self):
       self.close()
 
   def addDomainConfig(self):
+    kubernetes_platform = self.env.getEnvOrDef("KUBERNETES_PLATFORM", "")
+    if (str(kubernetes_platform).upper() == 'OPENSHIFT'):
+      os.system("chmod -R g=u %s" % self.domain_home)
+
     # Note: only config type is needed fmwconfig, security is excluded because it's in the primordial and contain
     # all the many policies files
     packcmd = "tar -pczf /tmp/domain.tar.gz %s/config/config.xml %s/config/jdbc/ %s/config/jms %s/config/coherence " \

operator/src/main/resources/scripts/modelInImage.sh

@@ -785,6 +785,12 @@ function createPrimordialDomain() {
     local MII_PASSPHRASE=$(cat ${RUNTIME_ENCRYPTION_SECRET_PASSWORD})
     encrypt_decrypt_domain_secret "encrypt" ${DOMAIN_HOME} ${MII_PASSPHRASE}
 
+    if [[ "${KUBERNETES_PLATFORM^^}" == "OPENSHIFT" ]]; then
+      # Operator running on Openshift platform - change file permissions in the DOMAIN_HOME dir to give
+      # group same permissions as user .
+      chmod -R g=u ${DOMAIN_HOME} || return 1
+    fi
+
     tar -pczf ${LOCAL_PRIM_DOMAIN_ZIP} --exclude ${DOMAIN_HOME}/wlsdeploy --exclude ${DOMAIN_HOME}/sysman/log  \
     --exclude ${DOMAIN_HOME}/lib --exclude ${DOMAIN_HOME}/backup_config ${empath} ${DOMAIN_HOME}/*
 

operator/src/main/resources/scripts/startServer.sh

@@ -300,17 +300,16 @@ if [ ${DOMAIN_SOURCE_TYPE} != "FromModel" ]; then
   copySitCfgWhileBooting /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/jms         'Sit-Cfg-JMS--'
   copySitCfgWhileBooting /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/jdbc        'Sit-Cfg-JDBC--'
   copySitCfgWhileBooting /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/diagnostics 'Sit-Cfg-WLDF--'
-else
-  if [[ ${KUBERNETES_PLATFORM^^} == "OPENSHIFT" ]]; then
-    # Operator running on Openshift platform - change file permissions in the DOMAIN_HOME dir to give
-    # group same permissions as user .
-    chmod -R g=u ${DOMAIN_HOME} || return 1
-  fi
 fi
 
-if [[ ${KUBERNETES_PLATFORM^^} == "OPENSHIFT" ]]; then
+if [[ "${KUBERNETES_PLATFORM^^}" == "OPENSHIFT" ]]; then
     # When the Operator is running on Openshift platform, disable insecure file system warnings.
     export JAVA_OPTIONS="-Dweblogic.SecureMode.WarnOnInsecureFileSystem=false $JAVA_OPTIONS"
+    if [[ "${DOMAIN_SOURCE_TYPE}" == "Image" ]]; then
+      # Change the file permissions in the DOMAIN_HOME dir to give group same permissions as user .
+      chmod -R g=u ${DOMAIN_HOME} || return 1
+    fi
+
 fi
 
 #