Merge pull request #594 from oracle/owls-70100

Introspect: Remove admin secret mount from wl pods

Author: rjeberhard

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

@@ -24,7 +24,6 @@
 import io.kubernetes.client.models.V1Pod;
 import io.kubernetes.client.models.V1PodSpec;
 import io.kubernetes.client.models.V1Probe;
-import io.kubernetes.client.models.V1SecretVolumeSource;
 import io.kubernetes.client.models.V1Status;
 import io.kubernetes.client.models.V1Volume;
 import io.kubernetes.client.models.V1VolumeMount;
@@ -177,10 +176,6 @@ private String getIncludeServerOutInPodLog() {
 
   abstract String getServerName();
 
-  private String getAdminSecretName() {
-    return getDomain().getAdminSecret().getName();
-  }
-
   private List<V1PersistentVolumeClaim> getClaims() {
     return info.getClaims().getItems();
   }
@@ -596,10 +591,6 @@ protected V1PodSpec createSpec(TuningParameters tuningParameters) {
                 createContainer(tuningParameters)
                     .resources(getServerSpec().getResources())
                     .securityContext(getServerSpec().getContainerSecurityContext()))
-            .addVolumesItem(
-                new V1Volume()
-                    .name(SECRETS_VOLUME)
-                    .secret(new V1SecretVolumeSource().secretName(getAdminSecretName())))
             .addVolumesItem(
                 new V1Volume()
                     .name(SCRIPTS_VOLUME)
@@ -661,7 +652,6 @@ private V1Container createContainer(TuningParameters tuningParameters) {
             .env(getEnvironmentVariables(tuningParameters))
             .addPortsItem(new V1ContainerPort().containerPort(getPort()).protocol("TCP"))
             .lifecycle(createLifecycle())
-            .addVolumeMountsItem(readOnlyVolumeMount(SECRETS_VOLUME, SECRETS_MOUNT_PATH))
             .addVolumeMountsItem(readOnlyVolumeMount(SCRIPTS_VOLUME, SCRIPTS_MOUNTS_PATH))
             .addVolumeMountsItem(readOnlyVolumeMount(DEBUG_CM_VOLUME, DEBUG_CM_MOUNTS_PATH))
             .livenessProbe(createLivenessProbe(tuningParameters.getPodTuning()));

operator/src/test/java/oracle/kubernetes/operator/helpers/PodHelperTestBase.java

@@ -94,7 +94,6 @@ public abstract class PodHelperTestBase {
   private static final int CONFIGURED_PERIOD = 35;
   private static final String LOG_HOME = "/shared/logs";
   private static final String NODEMGR_HOME = "/u01/nodemanager";
-  private static final String CREDENTIALS_VOLUME_NAME = "weblogic-credentials-volume";
   private static final String CONFIGMAP_VOLUME_NAME = "weblogic-domain-cm-volume";
   private static final String SIT_CONFIG_MAP_VOLUME_SUFFIX =
       "-weblogic-domain-introspect-cm-volume";
@@ -271,7 +270,6 @@ public void whenPodCreated_containerHasExpectedVolumeMounts() {
             writableVolumeMount("weblogic-domain-storage-volume", "/shared"),
             writableVolumeMount(
                 UID + SIT_CONFIG_MAP_VOLUME_SUFFIX, "/weblogic-operator/introspector"),
-            readOnlyVolumeMount("weblogic-credentials-volume", "/weblogic-operator/secrets"),
             readOnlyVolumeMount("weblogic-domain-debug-cm-volume", "/weblogic-operator/debug"),
             readOnlyVolumeMount("weblogic-domain-cm-volume", "/weblogic-operator/scripts")));
   }
@@ -284,7 +282,6 @@ public void whenPodCreated_withNoPVC_containerHasExpectedVolumeMounts() {
         containsInAnyOrder(
             writableVolumeMount(
                 UID + SIT_CONFIG_MAP_VOLUME_SUFFIX, "/weblogic-operator/introspector"),
-            readOnlyVolumeMount("weblogic-credentials-volume", "/weblogic-operator/secrets"),
             readOnlyVolumeMount("weblogic-domain-debug-cm-volume", "/weblogic-operator/debug"),
             readOnlyVolumeMount("weblogic-domain-cm-volume", "/weblogic-operator/scripts")));
   }
@@ -426,13 +423,6 @@ public void whenDomainSpecifiesClaimName_podSpecUsesIt() {
     assertThat(storageVolume.getPersistentVolumeClaim().getClaimName(), equalTo("predefined"));
   }
 
-  @Test
-  public void createdPod_hasCredentialsVolume() {
-    V1Volume credentialsVolume = getVolumeWithName(getCreatedPod(), CREDENTIALS_VOLUME_NAME);
-
-    assertThat(credentialsVolume.getSecret().getSecretName(), equalTo(ADMIN_SECRET_NAME));
-  }
-
   @Test
   public void createdPod_hasConfigMapVolume() {
     V1Volume credentialsVolume = getVolumeWithName(getCreatedPod(), CONFIGMAP_VOLUME_NAME);