More test fixing

Author: rjeberhard

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

@@ -19,16 +19,16 @@ final void updateForDeepSubstitution(V1PodSpec podSpec, Object target) {
     getContainer(podSpec)
         .ifPresent(
             c -> {
-              doDeepSubstitution(deepSubVars(c.getEnv()), target);
+              doDeepSubstitution(augmentSubVars(deepSubVars(c.getEnv())), target);
             });
   }
 
   final Map<String, String> deepSubVars(List<V1EnvVar> envVars) {
     return varsToSubVariables(envVars);
   }
 
-  protected void augmentSubVars(Map<String, String> vars) {
-    // no-op
+  protected Map<String, String> augmentSubVars(Map<String, String> vars) {
+    return vars;
   }
 
   protected Optional<V1Container> getContainer(V1Pod v1Pod) {

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

@@ -83,9 +83,10 @@ protected String getMainContainerName() {
   }
 
   @Override
-  protected void augmentSubVars(Map<String, String> vars) {
+  protected Map<String, String> augmentSubVars(Map<String, String> vars) {
     // HERE: placeholder that needs to be documented
     vars.put("SERVER_NAME", "introspector");
+    return vars;
   }
 
   String getWebLogicCredentialsSecretName() {

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

@@ -404,11 +404,12 @@ V1Pod withNonHashedElements(V1Pod pod) {
   }
 
   @Override
-  protected void augmentSubVars(Map<String, String> vars) {
+  protected Map<String, String> augmentSubVars(Map<String, String> vars) {
     String clusterName = getClusterName();
     if (clusterName != null) {
       vars.put("CLUSTER_NAME", clusterName);
     }
+    return vars;
   }
 
   final void updateForStartupMode(V1Pod pod) {