OWLS-67479 Rework the 2.0 operator helm chart to never create the domains namespace

Author: moreaut

kubernetes/charts/weblogic-operator/templates/_domains-namespaces.tpl

@@ -11,7 +11,6 @@
 {{- range $key, $element := $domainsNamespaces -}}
 {{-   $args := merge (dict) $element $scope -}}
 {{-   $ignore := set $args "domainsNamespace" $key -}}
-{{-   include "operator.domainsNamespace" $args -}}
 {{- /*   include "operator.domainConfigMap" $args currently the GA operator runtime does this */ -}}
 {{-   include "operator.operatorRoleBinding" $args -}}
 {{- end }}

kubernetes/charts/weblogic-operator/templates/_domains-ns.tpl

@@ -52,17 +52,7 @@
 {{-     if include "operator.verifyObjectInput" (list $scope $scope "domainsNamespaces") -}}
 {{-       $domainsNamespaces := $scope.domainsNamespaces -}}
 {{-       range $key, $element := $domainsNamespaces -}}
-{{-         if include "operator.verifyObjectInput" (list $scope $domainsNamespaces $key) -}}
-{{-           $s := merge (dict) $element $scope -}}
-{{-           if include "operator.verifyBooleanInput" (list $scope $s "createDomainsNamespace") -}}
-{{-             if eq $key "default" -}}
-{{-               if $s.createDomainsNamespace -}}
-{{-                 $errorMsg := cat "The effective createDomainsNamespace value for the 'default' domainsNamespace must be set to false." -}}
-{{-                 $ignore := include "operator.recordValidationError" (list $scope $errorMsg) -}}
-{{-               end -}}
-{{-             end -}}
-{{-           end -}}
-{{-         end -}}
+{{-         $ignore := include "operator.verifyObjectInput" (list $scope $domainsNamespaces $key) -}}
 {{-       end -}}
 {{-     end -}}
 {{-   end -}}

kubernetes/charts/weblogic-operator/templates/_validate-inputs.tpl

@@ -19,31 +19,16 @@ operatorNamespace: "weblogic-operator"
 # The name must be lowercase
 operatorServiceAccount: "weblogic-operator"
 
-# createDomainsNamespace is a global variable that specifies whether or not the helm installation should create the Kubernetes
-# namespaces for the domains specified in domainsNamespaces.
-createDomainsNamespace: true
-
-# domainsNamespaces specifies a map of WebLogic Domain namespaces which the operator manages (same as targetNamespaces but in map format)
-# The names must be lowercase
+# domainsNamespaces specifies a dictionary of WebLogic Domain namespaces which the operator manages (same as targetNamespaces but in dictionary format)
+# The names must be lowercase.  The values must be empty dictionaries.
+# The customer is responsible for creating these namespaces.
 #
-# Example 1: In the configuration below, the helm installation will create the Domain namespace 'namespace2' but not 'namespace1'.
+# Example : In the configuration below, the helm installation will manage namespace1 and namespace2.
 #
 # createDomainsNamespace: true
 # domainsNamespaces:
-#   namespace1:
-#     createDomainsNamespace: false
-#   namespace2: {}
-#
-#-----------------------------------
-#
-# Example 2: In the configuration below, the helm installation will create the Domain namespace 'namespace2' but not 'namespace1'.
-#
-# createDomainsNamespace: false
-# domainsNamespaces:
 #   namespace1: {}
-#   namespace2:
-#     createDomainsNamespace: true
-#
+#   namespace2: {}
 domainsNamespaces: {}
 
 # operatorImage specifies the docker image containing the operator code.

kubernetes/charts/weblogic-operator/values.yaml

@@ -10,7 +10,6 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.emptyString;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.hamcrest.Matcher;
 import org.junit.Before;
@@ -324,35 +323,4 @@ public void whenDomainsNamespacesPrimitiveType_reportError() throws Exception {
 
     assertThat(getProcessingError(), containsTypeError("domainsNamespaces", "map", "bool"));
   }
-
-  @Test
-  public void whenDomainsNamespacesCreateNotBool_reportError() throws Exception {
-    setProperty(
-        "domainsNamespaces",
-        ImmutableMap.of("aaa", ImmutableMap.of("createDomainsNamespace", 123)));
-
-    assertThat(
-        getProcessingError(), containsTypeError("createDomainsNamespace", "bool", "float64"));
-  }
-
-  @Test
-  public void whenDefaultNamespaceHasCreatedTrue_reportError() throws Exception {
-    setProperty(
-        "domainsNamespaces",
-        ImmutableMap.of("default", ImmutableMap.of("createDomainsNamespace", true)));
-
-    assertThat(
-        getProcessingError(),
-        containsString(
-            "The effective createDomainsNamespace value for the 'default' domainsNamespace must be set to false."));
-  }
-
-  @Test
-  public void whenDefaultNamespaceHasCreatedFalse_doNotReportError() throws Exception {
-    setProperty(
-        "domainsNamespaces",
-        ImmutableMap.of("default", ImmutableMap.of("createDomainsNamespace", false)));
-
-    assertThat(getProcessingError(), emptyString());
-  }
 }

kubernetes/src/test/java/oracle/kubernetes/operator/helm/CreateOperatorInputsValidationIT.java

@@ -754,7 +754,6 @@ function deploy_operator {
       echo "setupKubernetesCluster: $SETUP_KUBERNETES_CLUSTER" >> $inputs
 
       trace 'customize the inputs yaml file to add test namespace'
-      echo "createDomainsNamespace: false" >> $inputs
       echo "domainsNamespaces:" >> $inputs
       for i in $(echo $TARGET_NAMESPACES | sed "s/,/ /g")
       do