Merge pull request #626 from oracle/custom-override-secret-fix

Fix bug in override secret mount path

Author: rjeberhard

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

@@ -235,7 +235,8 @@ private V1Container createContainer(TuningParameters tuningParameters) {
     List<String> configOverrideSecrets = getConfigOverrideSecrets();
     for (String secretName : configOverrideSecrets) {
       container.addVolumeMountsItem(
-          readOnlyVolumeMount(secretName + "-volume", OVERRIDE_SECRETS_MOUNT_PATH));
+          readOnlyVolumeMount(
+              secretName + "-volume", OVERRIDE_SECRETS_MOUNT_PATH + '/' + secretName));
     }
     return container;
   }

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

@@ -789,6 +789,13 @@ def __init__(self, env):
 
 
   def addSecretsFromDirectory(self, secret_path, secret_name):
+    if not os.path.isdir(secret_path):
+      # The operator pod somehow put a file where we
+      # only expected to find a directory mount.
+      self.env.addError("Internal Error:  Secret path'" 
+                        + secret_path + "'" +
+                        + " is not a directory.")
+      return
     for the_file in os.listdir(secret_path):
       the_file_path = os.path.join(secret_path, the_file)
       if os.path.isfile(the_file_path):