Merge pull request #606 from oracle/develop-operator-helm-chart-values-cleanup

Develop operator helm chart values cleanup

Author: rjeberhard

kubernetes/charts/weblogic-operator/Chart.yaml

@@ -3,4 +3,4 @@
 
 name: weblogic-operator
 version: 2.0
-description: Helm package for creation of the Weblogic operator.
+description: Helm chart for configuring the WebLogic operator.

kubernetes/charts/weblogic-operator/values.yaml

@@ -1,36 +1,39 @@
 # 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.
 
-# serviceAccount specifies the name of the service account that the operator will use to
-# make requests to the Kubernetes API server.
-# The name must be lowercase.
+# serviceAccount specifies the name of the service account in the operator's namespace that the
+# operator will use to make requests to the Kubernetes API server.
+# The customer is responsible for creating the service account.
+# If not specified, the the operator will use the operator's namespace's 'default' service account.
 serviceAccount: "default"
 
-# domainNamespaces specifies list of WebLogic Domain namespaces which the operator manages
-# The names must be lowercase.
+# domainNamespaces specifies list of WebLogic Domain namespaces which the operator manages.
 # The customer is responsible for creating these namespaces.
+# If not specified, then the operator will manage WebLogic domains in the Kubernetes 'default' namespace.
 #
 # Example : In the configuration below, the helm installation will manage namespace1 and namespace2.
 #
 # domainNamespaces:
-#   - namespace1
-#   - namespace2
-domainNamespaces: [ "default" ]
+#   - "namespace1"
+#   - "namespace2"
+domainNamespaces:
+  - "default"
 
 # image specifies the docker image containing the operator code.
-image: "weblogic-kubernetes-operator:1.1"
+image: "weblogic-kubernetes-operator:2.0"
 
 # imagePullPolicy specifies the image pull policy for the operator docker image.
 imagePullPolicy: "IfNotPresent"
 
 # imagePullSecrets contains an optional list of Kubernetes secrets, in the operator's namepace,
 # that are needed to access the registry containing the operator Docker image.
+# The customer is responsible for creating the secret.
 # If no secrets are required, then omit this property.
 #
 # Example : a secret is needed, and has been stored in 'my-operator-secret'
 #
 # imagePullSecrets:
-# - name: my-operator-secret
+# - name: "my-operator-secret"
 #
 # imagePullSecrets:
 # - name:
@@ -39,7 +42,7 @@ imagePullPolicy: "IfNotPresent"
 # outside of the Kubernetes cluster on the port specified by the 'externalRestHttpsPort'
 # property.
 #
-# If set to true, then the customer provide the SSL certificate and private key for
+# If set to true, then the customer must provide the SSL certificate and private key for
 # the operator's external REST intervace by specifying the 'externalOperatorCert' and
 # 'externalOperatorKey' properties.
 externalRestEnabled: false
@@ -49,20 +52,20 @@ externalRestEnabled: false
 # Otherwise, it is ignored.
 externalRestHttpsPort: 31001
 
-# The customer supplied certificate to use for the external operator REST
-# https interface.  The value must be a string containing a base64 encoded PEM certificate.
+# The customer supplied certificate to use for the external operator REST https interface.
+# The value must be a string containing a base64 encoded PEM certificate.
 # This parameter is required if 'externalRestEnabled' is true.
 # Otherwise, it is ignored.
 #externalOperatorCert:
 
-# The customer supplied private key to use for the external operator REST
-# https interface.  The value must be a string containing a base64 encoded PEM key.
+# The customer supplied private key to use for the external operator REST https interface.
+# The value must be a string containing a base64 encoded PEM key.
 # This parameter is required if 'externalRestEnabled' is true.
 # Otherwise, it is ignored.
 #externalOperatorKey:
 
-# remoteDebugNodePortEnabled specifies whether or not the operator will start a Java remote debug server on the
-# provided port and suspend execution until a remote debugger has attached.
+# remoteDebugNodePortEnabled specifies whether or not the operator will start a Java remote debug server
+# on the provided port and suspend execution until a remote debugger has attached.
 # The 'internalDebugHttpPort' property controls the port number inside the Kubernetes
 # cluster and the 'externalDebugHttpPort' property controls the port number outside
 # the Kubernetes cluster.
@@ -87,12 +90,14 @@ javaLoggingLevel: "INFO"
 # elkIntegrationEnabled specifies whether or not ELK integration is enabled.
 elkIntegrationEnabled: false
 
-# logStashImage specifies the docker image containing logstash
-# TBD - should the logstash image pull policy and image pull secrets be configurable?
+# logStashImage specifies the docker image containing logstash.
+# This parameter is ignored if 'elkIntegrationEnabled' is false.
 logStashImage: "logstash:5"
 
-# elasticSearchHost specifies the hostname of where elasticsearch is running
+# elasticSearchHost specifies the hostname of where elasticsearch is running.
+# This parameter is ignored if 'elkIntegrationEnabled' is false.
 elasticSearchHost: "elasticsearch.default.svc.cluster.local"
 
-# elasticSearchPort specifies the port number of where elasticsearch is running
+# elasticSearchPort specifies the port number of where elasticsearch is running.
+# This parameter is ignored if 'elkIntegrationEnabled' is false.
 elasticSearchPort: 9200

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

@@ -476,7 +476,7 @@ private String getExpectedOperatorHelmChartDefaultValues() {
         .append("externalDebugHttpPort: 30999\n")
         .append("externalRestEnabled: false\n")
         .append("externalRestHttpsPort: 31001\n")
-        .append("image: weblogic-kubernetes-operator:1.1\n")
+        .append("image: weblogic-kubernetes-operator:2.0\n")
         .append("imagePullPolicy: IfNotPresent\n")
         .append("internalDebugHttpPort: 30999\n")
         .append("javaLoggingLevel: INFO\n")