Rename setupKubernetesCluster to createSharedOperatorResources, fix list input validation, fix a domainsNamespaces that was still expecting it to be a map, instead of a string array

Author: moreaut

kubernetes/charts/weblogic-operator/templates/_inputs-utils.tpl

@@ -64,9 +64,6 @@ Verify that a list input value has been specified
 {{-   if not (hasKey $status "error") -}}
         true
 {{-   end -}}
-{{- else -}}
-{{-   $errorMsg := cat "The" $requiredKind "property" $name "must be specified." -}}
-{{-   include "operator.recordValidationError" (list $scope $errorMsg) -}}
 {{- end -}}
 {{- end -}}
 

kubernetes/charts/weblogic-operator/templates/_kubernetes-cluster.tpl renamed to kubernetes/charts/weblogic-operator/templates/_shared-operator-resources.tpl

@@ -1,7 +1,7 @@
 # Copyright 2018 Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
-{{- define "operator.kubernetesCluster" -}}
+{{- define "operator.sharedOperatorResources" -}}
 {{- include "operator.elasticSearchDeployment" . }}
 {{- include "operator.elasticSearchService" . }}
 {{- include "operator.kibanaDeployment" . }}

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

@@ -3,8 +3,8 @@
 
 {{- define "operator.validateInputs" -}}
 {{- $scope := . -}}
-{{- if include "operator.verifyBooleanInput" (list $scope $scope "setupKubernetesCluster") -}}
-{{-   if $scope.setupKubernetesCluster }}
+{{- if include "operator.verifyBooleanInput" (list $scope $scope "createSharedOperatorResources") -}}
+{{-   if $scope.createSharedOperatorResources }}
 {{-     $ignore := include "operator.verifyBooleanInput" (list $scope $scope "elkIntegrationEnabled") -}}
 {{-   end }}
 {{- end }}

kubernetes/charts/weblogic-operator/templates/main.yaml

@@ -7,8 +7,8 @@
 {{- $ignore := set $scope "Files" .Files -}}
 {{- $ignore := set $scope "Chart" .Chart -}}
 
-{{- if .Values.setupKubernetesCluster }}
-{{ include "operator.kubernetesCluster" $scope }}
+{{- if .Values.createSharedOperatorResources }}
+{{ include "operator.sharedOperatorResources" $scope }}
 {{- end }}
 
 {{- if .Values.createOperator }}

kubernetes/charts/weblogic-operator/values.yaml

@@ -1,9 +1,10 @@
 # Copyright 2018 Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
-# setupKubernetesCluster specifies whether or not the installation should deploy Kubernetes components
-# such as elasticsearch, kibana, operator RBAC roles, etc.
-setupKubernetesCluster: true
+# createSharedOperatorResources specifies whether or not the installation should create the
+# Kubernetes resources that are shared by all operators in this Kubernetes cluster such as
+# elasticsearch, kibana, operator RBAC roles, etc.
+createSharedOperatorResources: true
 
 # createOperator specifies whether or not the installation should create the operator and its resources.
 createOperator: true
@@ -29,7 +30,7 @@ operatorServiceAccount: "weblogic-operator"
 # domainsNamespaces:
 #   - namespace1
 #   - namespace2
-domainsNamespaces: {}
+domainsNamespaces: []
 
 # operatorImage specifies the docker image containing the operator code.
 operatorImage: "weblogic-kubernetes-operator:1.0"

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

@@ -21,7 +21,7 @@ public class CreateOperatorInputsValidationIT extends ChartITBase {
   private static final String WRONG_TYPE = "The %s property %s must be a %s instead";
 
   private static final String[] TOP_LEVEL_BOOLEAN_PROPERTIES = {
-    "setupKubernetesCluster", "createOperator" // , "elkIntegrationEnabled"
+    "createSharedOperatorResources", "createOperator" // , "elkIntegrationEnabled"
   };
 
   private static final String[] OPERATOR_LEVEL_BOOLEAN_PROPERTIES = {"elkIntegrationEnabled"};
@@ -321,6 +321,6 @@ public void whenRemoteDebugNodePortDisabled_reportNonNumericPortNumbers() throws
   public void whenDomainsNamespacesPrimitiveType_reportError() throws Exception {
     setProperty("domainsNamespaces", true);
 
-    assertThat(getProcessingError(), containsTypeError("domainsNamespaces", "map", "bool"));
+    assertThat(getProcessingError(), containsTypeError("domainsNamespaces", "slice", "bool"));
   }
 }

src/integration-tests/bash/run.sh

@@ -653,7 +653,7 @@ function create_image_pull_secret_wercker {
 
 }
 
-# op_define OP_KEY NAMESPACE TARGET_NAMESPACES EXTERNAL_REST_HTTPSPORT SETUP_KUBERNETES_CLUSTER
+# op_define OP_KEY NAMESPACE TARGET_NAMESPACES EXTERNAL_REST_HTTPSPORT CREATE_SHARED_OPERATOR_RESOURCES
 #   sets up table of operator values.
 #
 # op_get    OP_KEY
@@ -671,13 +671,13 @@ function create_image_pull_secret_wercker {
 
 function op_define {
     if [ "$#" != 5 ] ; then
-      fail "requires 5 parameters: OP_KEY NAMESPACE TARGET_NAMESPACES EXTERNAL_REST_HTTPSPORT SETUP_KUBERNETES_CLUSTER"
+      fail "requires 5 parameters: OP_KEY NAMESPACE TARGET_NAMESPACES EXTERNAL_REST_HTTPSPORT CREATE_SHARED_OPERATOR_RESOURCES"
     fi
     local opkey="`echo \"${1?}\" | sed 's/-/_/g'`"
     eval export OP_${opkey}_NAMESPACE="$2"
     eval export OP_${opkey}_TARGET_NAMESPACES="$3"
     eval export OP_${opkey}_EXTERNAL_REST_HTTPSPORT="$4"
-    eval export OP_${opkey}_SETUP_KUBERNETES_CLUSTER="$5"
+    eval export OP_${opkey}_CREATE_SHARED_OPERATOR_RESOURCES="$5"
 
     # generated TMP_DIR for operator = $USER_PROJECTS_DIR/weblogic-operators/$NAMESPACE :
     eval export OP_${opkey}_TMP_DIR="$USER_PROJECTS_DIR/weblogic-operators/$2"
@@ -745,13 +745,13 @@ function deploy_operator {
     mkdir -p $TMP_DIR
     if [ "$USE_HELM" = "true" ]; then
       local inputs="$TMP_DIR/weblogic-operator-values.yaml"
-      local SETUP_KUBERNETES_CLUSTER="`op_get $opkey SETUP_KUBERNETES_CLUSTER`"
+      local CREATE_SHARED_OPERATOR_RESOURCES="`op_get $opkey CREATE_SHARED_OPERATOR_RESOURCES`"
 
       # generate certificates
       $PROJECT_ROOT/kubernetes/generate-internal-weblogic-operator-certificate.sh > $inputs
       $PROJECT_ROOT/kubernetes/generate-external-weblogic-operator-certificate.sh DNS:${NODEPORT_HOST} >> $inputs
 
-      echo "setupKubernetesCluster: $SETUP_KUBERNETES_CLUSTER" >> $inputs
+      echo "createSharedOperatorResources: $CREATE_SHARED_OPERATOR_RESOURCES" >> $inputs
 
       trace 'customize the inputs yaml file to add test namespace'
       echo "domainsNamespaces:" >> $inputs
@@ -2998,7 +2998,7 @@ function test_suite {
 
     declare_new_test 1 define_operators_and_domains
 
-    #          OP_KEY  NAMESPACE            TARGET_NAMESPACES  EXTERNAL_REST_HTTPSPORT  SETUP_KUBERNETES_CLUSTER
+    #          OP_KEY  NAMESPACE            TARGET_NAMESPACES  EXTERNAL_REST_HTTPSPORT  CREATE_SHARED_OPERATOR_RESOURCES
     op_define  oper1   weblogic-operator-1  "default,test1"    31001                    true
     op_define  oper2   weblogic-operator-2  test2              32001                    false