fix test case error

Author: davidzl

kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl

@@ -36,12 +36,12 @@ spec:
           value: "false"
         - name: "JAVA_LOGGING_LEVEL"
           value: {{ .javaLoggingLevel | quote }}
+        - name: ISTIO_ENABLED
+          value: {{ .istioEnabled | quote }}
         {{- if .remoteDebugNodePortEnabled }}
         - name: "REMOTE_DEBUG_PORT"
           value: {{ .internalDebugHttpPort | quote }}
         {{- end }}
-        - name: ISTIO_ENABLED
-          value: {{ .istioEnabled | quote }}
         {{- if .mockWLS }}
         - name: "MOCK_WLS"
           value: "true"

kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesOptionalFeaturesEnabledTestBase.java

@@ -58,8 +58,7 @@ public ExtensionsV1beta1Deployment getExpectedWeblogicOperatorDeployment() {
     operatorContainer
         .addVolumeMountsItem(newVolumeMount().name("log-dir").mountPath("/logs").readOnly(false))
         .addEnvItem(
-            newEnvVar().name("REMOTE_DEBUG_PORT").value(getInputs().getInternalDebugHttpPort()))
-        .addEnvItem(newEnvVar().name("ISTIO_ENABLED").value("false"));
+            newEnvVar().name("REMOTE_DEBUG_PORT").value(getInputs().getInternalDebugHttpPort()));
     expected
         .getSpec()
         .getTemplate()

kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesTestBase.java

@@ -212,6 +212,8 @@ protected ExtensionsV1beta1Deployment getExpectedWeblogicOperatorDeployment() {
                                             newEnvVar()
                                                 .name("JAVA_LOGGING_LEVEL")
                                                 .value(getInputs().getJavaLoggingLevel()))
+                                        .addEnvItem(
+                                            newEnvVar().name("ISTIO_ENABLED").value("false"))
                                         .resources(
                                             new V1ResourceRequirements()
                                                 .putRequestsItem("cpu", Quantity.fromString("100m"))