Merge pull request #367 from oracle/fix_pull366_comments

alai8 · web-flow · commit 78ec9798f171 · 2018-07-30T10:37:59.000-07:00
address review comments in pull 366
diff --git a/kubernetes/charts/weblogic-domain/Chart.yaml b/kubernetes/charts/weblogic-domain/Chart.yaml
@@ -1,6 +1,6 @@
-# Copyright 2017, Oracle Corporation and/or its affiliates.  All rights reserved.
+# 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.
 
 name: weblogic-domain
-version: 0.2.0
-description: Helm package for creation of Weblogic domain.
+version: 2.0
+description: Helm package for creation of WebLogic domain.
diff --git a/kubernetes/charts/weblogic-domain/README.md b/kubernetes/charts/weblogic-domain/README.md
@@ -3,7 +3,7 @@ This chart creates a single Weblogic domain on a [Kubernetes](https://kubernetes
 [Helm](https://github.com/kubernetes/helm) package manager.
 
 ## Prerequisites
-- Kubernetes 1.7.5+ with Beta APIs enabled
+- [Requirements for the Oracle WebLogic Server Kubernetes Operator](https://github.com/oracle/weblogic-kubernetes-operator/blob/master/README.md)
 
 - Install [Helm](https://github.com/kubernetes/helm#install)
 
@@ -48,7 +48,7 @@ cd kubernetes/charts
 To install the chart with the release `my-release`, namespace `my-namespace` and secret `my-secret' without creating a weblogic domain (such as when a WebLogic domain already exists):
 
 ```bash
-helm install weblogic-domain --name my-release --namespace my-namespace --set weblogicCredentialsSecretName=my-secret --set createWeblogicDomain=false
+helm install weblogic-domain --name my-release --namespace my-namespace --set weblogicCredentialsSecretName=my-secret --set createWebLogicDomain=false
 ```
 
 The command deploys weblogic-domain on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists
@@ -69,7 +69,7 @@ The command removes all the Kubernetes components associated with the chart and
 ## Configuration 
 |  Key                           |  Description                      |  Default              |
 | -------------------------------|-----------------------------------|-----------------------|
-| createWeblogicDomain | Boolean indicating if a weblogic domain should be created | true |
+| createWebLogicDomain | Boolean indicating if a weblogic domain should be created | true |
 | adminPort | Port number for Admin Server | 7001 |
 | adminServerName | Name of the Admin Server | admin-server |
 | domainName | Name of the WebLogic domain to create | base_domain |
diff --git a/kubernetes/charts/weblogic-domain/templates/_helpers.tpl b/kubernetes/charts/weblogic-domain/templates/_helpers.tpl
@@ -1,4 +1,4 @@
-# Copyright 2017, Oracle Corporation and/or its affiliates.  All rights reserved.
+# 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.
 
 {{/* vim: set filetype=mustache: */}}
diff --git a/kubernetes/charts/weblogic-domain/templates/create-weblogic-domain-job.yaml b/kubernetes/charts/weblogic-domain/templates/create-weblogic-domain-job.yaml
@@ -1,6 +1,6 @@
-# Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# 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.
-{{- if .Values.createWeblogicDomain }}
+{{- if .Values.createWebLogicDomain }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -113,7 +113,7 @@ data:
     # Create the domain
     wlst.sh -skipWLSModuleScanning /u01/weblogic/create-domain.py
 
-    echo "Successfully Completed"
+    echo "WebLogic domain configuration by create-domain-script.py successfully completed"
 
   create-domain.py: |-
     # This python script is used to create a WebLogic domain
@@ -183,7 +183,7 @@ data:
     set('NativeVersionEnabled', 'true')
     set('StartScriptEnabled', 'false')
     set('SecureListener', 'false')
-    set('LogLevel', 'FINEST')
+    set('LogLevel', 'INFO')
     set('DomainsDirRemoteSharingEnabled', 'true')
 
     # Set the Node Manager user name and password (domain name will change after writeDomain)
diff --git a/kubernetes/charts/weblogic-domain/templates/create-weblogic-domain-pv.yaml b/kubernetes/charts/weblogic-domain/templates/create-weblogic-domain-pv.yaml
@@ -1,4 +1,4 @@
-# Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# 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.
 
 apiVersion: v1
diff --git a/kubernetes/charts/weblogic-domain/templates/create-weblogic-domain-pvc.yaml b/kubernetes/charts/weblogic-domain/templates/create-weblogic-domain-pvc.yaml
@@ -1,4 +1,4 @@
-# Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# 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.
 
 kind: PersistentVolumeClaim
diff --git a/kubernetes/charts/weblogic-domain/templates/domain-custom-resource.yaml b/kubernetes/charts/weblogic-domain/templates/domain-custom-resource.yaml
@@ -1,4 +1,4 @@
-# Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
+# 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.
 #
 # This is an example of how to define a Domain Custom Resource.
diff --git a/kubernetes/charts/weblogic-domain/templates/voyager-operator-security.yaml b/kubernetes/charts/weblogic-domain/templates/voyager-operator-security.yaml
@@ -1,3 +1,5 @@
+# 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.
 {{- if eq .Values.loadBalancer "VOYAGER" }}
 apiVersion: v1
 kind: ServiceAccount
diff --git a/kubernetes/charts/weblogic-domain/templates/voyager-operator.yaml b/kubernetes/charts/weblogic-domain/templates/voyager-operator.yaml
@@ -1,3 +1,5 @@
+# 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.
 {{- if eq .Values.loadBalancer "VOYAGER" }}
 apiVersion: apps/v1beta1
 kind: Deployment
diff --git a/kubernetes/charts/weblogic-domain/templates/weblogic-domain-apache-security.yaml b/kubernetes/charts/weblogic-domain/templates/weblogic-domain-apache-security.yaml
@@ -1,3 +1,5 @@
+# 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.
 {{- if eq .Values.loadBalancer "APACHE" }}
 ---
 kind: ClusterRole
diff --git a/kubernetes/charts/weblogic-domain/templates/weblogic-domain-apache.yaml b/kubernetes/charts/weblogic-domain/templates/weblogic-domain-apache.yaml
@@ -1,3 +1,5 @@
+# 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.
 {{- if eq .Values.loadBalancer "APACHE" }}
 ---
 apiVersion: v1
diff --git a/kubernetes/charts/weblogic-domain/templates/weblogic-domain-pv.yaml b/kubernetes/charts/weblogic-domain/templates/weblogic-domain-pv.yaml
@@ -1,4 +1,4 @@
-# Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# 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.
 
 apiVersion: v1
diff --git a/kubernetes/charts/weblogic-domain/templates/weblogic-domain-pvc.yaml b/kubernetes/charts/weblogic-domain/templates/weblogic-domain-pvc.yaml
@@ -1,4 +1,4 @@
-# Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# 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.
 
 kind: PersistentVolumeClaim
diff --git a/kubernetes/charts/weblogic-domain/templates/weblogic-domain-traefik-security.yaml b/kubernetes/charts/weblogic-domain/templates/weblogic-domain-traefik-security.yaml
@@ -1,3 +1,5 @@
+# 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.
 {{- if eq .Values.loadBalancer "TRAEFIK" }}
 ---
 kind: ClusterRole
diff --git a/kubernetes/charts/weblogic-domain/templates/weblogic-domain-traefik.yaml b/kubernetes/charts/weblogic-domain/templates/weblogic-domain-traefik.yaml
@@ -1,3 +1,5 @@
+# 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.
 {{- if eq .Values.loadBalancer "TRAEFIK" }}
 ---
 apiVersion: v1
diff --git a/kubernetes/charts/weblogic-domain/templates/weblogic-domain-voyager-ingress.yaml b/kubernetes/charts/weblogic-domain/templates/weblogic-domain-voyager-ingress.yaml
@@ -1,3 +1,5 @@
+# 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.
 {{- if eq .Values.loadBalancer "VOYAGER" }}
 apiVersion: voyager.appscode.com/v1beta1
 kind: Ingress
diff --git a/kubernetes/charts/weblogic-domain/values.yaml b/kubernetes/charts/weblogic-domain/values.yaml
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 # Boolean indicating if weblogic domain should be created (Only available in helm charts templates)
-createWeblogicDomain: true
+createWebLogicDomain: true
 
 # The version of this inputs file.  Do not modify. (Not used in helm charts templates)
 version: create-weblogic-domain-inputs-v1
diff --git a/kubernetes/charts/weblogic-operator/Chart.yaml b/kubernetes/charts/weblogic-operator/Chart.yaml
@@ -2,5 +2,5 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 name: weblogic-operator
-version: 0.2.0
+version: 2.0
 description: Helm package for creation of the Weblogic operator.
diff --git a/src/integration-tests/bash/run.sh b/src/integration-tests/bash/run.sh
@@ -2439,8 +2439,8 @@ function startup_domain {
       local inputs=$TMP_DIR/create-weblogic-domain-inputs.yaml
       local outfile="$TMP_DIR/startup-weblogic-domain.out"
       cd $PROJECT_ROOT/kubernetes/charts
-      trace "calling helm install weblogic-domain --name ${DOM_KEY} -f $inputs --namespace ${NAMESPACE} --set createWeblogicDomain=false"
-      helm install weblogic-domain --name ${DOM_KEY} -f $inputs --namespace ${NAMESPACE} --set createWeblogicDomain=false 2>&1 | opt_tee ${outfile}
+      trace "calling helm install weblogic-domain --name ${DOM_KEY} -f $inputs --namespace ${NAMESPACE} --set createWebLogicDomain=false"
+      helm install weblogic-domain --name ${DOM_KEY} -f $inputs --namespace ${NAMESPACE} --set createWebLogicDomain=false 2>&1 | opt_tee ${outfile}
       trace "helm install output:"
       cat $outfile
     else   

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2017, Oracle Corporation and/or its affiliates. All rights reserved.`
	`1`	`+# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.`
`2`	`2`	`# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.`
`3`	`3`
`4`	`4`	`{{/* vim: set filetype=mustache: */}}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.`
	`1`	`+# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.`
`2`	`2`	`# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.`
`3`	`3`
`4`	`4`	`apiVersion: v1`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.`
	`2`	`+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.`
`1`	`3`	`{{- if eq .Values.loadBalancer "VOYAGER" }}`
`2`	`4`	`apiVersion: v1`
`3`	`5`	`kind: ServiceAccount`