Review comments

rjeberhard · rjeberhard · commit ede854d9e9b8 · 2019-03-01T05:55:26.000-05:00
diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 entries:
   weblogic-operator:
-  - created: 2019-02-28T10:34:35.435682-05:00
+  - created: 2019-03-01T05:54:26.779661-05:00
     description: Helm chart for configuring the WebLogic operator.
-    digest: ed18f122c56503019d4a32fee91915a1c8099a95f90b97ee9a1f31667e5dab2e
+    digest: 8ffd98cd5f3d080a07f3b1da4402c19969c92a8ec7af7ccdacae7c4097011b23
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.0.1.tgz
     version: 2.0.1
-generated: 2019-02-28T10:34:35.432593-05:00
+generated: 2019-03-01T05:54:26.776914-05:00
diff --git a/docs/charts/weblogic-operator-2.0.1.tgz b/docs/charts/weblogic-operator-2.0.1.tgz
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java b/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java
@@ -315,28 +315,6 @@ public void testClusterScaling(Operator operator, Domain domain) throws Exceptio
               + replicas);
     }
 
-    // make sure cluster service endpoint is updated with the scaled up servers before verifying
-    // load balancing
-    //    int i = 0;
-    //    while (i < BaseTest.getMaxIterationsPod()) {
-    //      int numberOfServersInEndpoint =
-    //          domain.getNumberOfServersInClusterServiceEndpoint((String)
-    // domainMap.get("clusterName"));
-    //      if (replicaCnt != numberOfServersInEndpoint) {
-    //        // check for last iteration
-    //        if (i == (BaseTest.getMaxIterationsPod() - 1)) {
-    //          throw new RuntimeException("FAILURE: Cluster Serice Endpoint is not updated");
-    //        }
-    //        Thread.sleep(BaseTest.getWaitTimePod() * 1000);
-    //        i++;
-    //      } else {
-    //        logger.info("Number of servers addresses in endpoint is same as replica count ");
-    //        break;
-    //      }
-    //    }
-    // commenting the load balance check, bug 29325139
-    // domain.verifyWebAppLoadBalancing(TESTWEBAPP);
-
     replicas = 2;
     podName = domainUid + "-" + managedServerNameBase + (replicas + 1);
     logger.info("Scale down to " + replicas + " managed servers");
diff --git a/json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/JsonSchemaMojo.java b/json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/JsonSchemaMojo.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/Main.java b/json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/Main.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/MainImpl.java b/json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/MainImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/json-schema-maven-plugin/src/test/java/oracle/kubernetes/json/mojo/JsonSchemaMojoTest.java b/json-schema-maven-plugin/src/test/java/oracle/kubernetes/json/mojo/JsonSchemaMojoTest.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/json-schema-maven-plugin/src/test/java/oracle/kubernetes/json/mojo/TestMain.java b/json-schema-maven-plugin/src/test/java/oracle/kubernetes/json/mojo/TestMain.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/json-schema/src/main/java/oracle/kubernetes/json/SchemaGenerator.java b/json-schema/src/main/java/oracle/kubernetes/json/SchemaGenerator.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/json-schema/src/test/java/oracle/kubernetes/json/DerivedObject.java b/json-schema/src/test/java/oracle/kubernetes/json/DerivedObject.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/json-schema/src/test/java/oracle/kubernetes/json/SchemaGeneratorTest.java b/json-schema/src/test/java/oracle/kubernetes/json/SchemaGeneratorTest.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/kubernetes/charts/weblogic-operator/values.yaml b/kubernetes/charts/weblogic-operator/values.yaml
@@ -20,7 +20,7 @@ domainNamespaces:
   - "default"
 
 # image specifies the docker image containing the operator code.
-image: "oracle/weblogic-kubernetes-operator:2.1"
+image: "oracle/weblogic-kubernetes-operator:2.0.1"
 
 # imagePullPolicy specifies the image pull policy for the operator docker image.
 imagePullPolicy: "IfNotPresent"
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-job-template.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-job-template.yaml
@@ -13,8 +13,6 @@ spec:
         weblogic.domainUID: %DOMAIN_UID%
         weblogic.domainName: %DOMAIN_NAME%
         app: %DOMAIN_UID%-create-weblogic-sample-domain-job
-      annotations:
-        sidecar.istio.io/inject: "false"
     spec:
       restartPolicy: Never
       containers:
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/delete-domain-job-template.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/delete-domain-job-template.yaml
@@ -31,8 +31,6 @@ spec:
         weblogic.domainUID: %DOMAIN_UID%
         weblogic.domainName: %DOMAIN_NAME%
         app: %DOMAIN_UID%-delete-weblogic-sample-domain-job
-      annotations:
-        sidecar.istio.io/inject: "false"
     spec:
       restartPolicy: Never
       containers:
diff --git a/kubernetes/src/test/java/oracle/kubernetes/operator/helm/HelmOperatorValuesTest.java b/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: oracle/weblogic-kubernetes-operator:2.1\n")
+        .append("image: oracle/weblogic-kubernetes-operator:2.0.1\n")
         .append("imagePullPolicy: IfNotPresent\n")
         .append("internalDebugHttpPort: 30999\n")
         .append("javaLoggingLevel: INFO\n")
diff --git a/operator/src/main/java/oracle/kubernetes/operator/DomainStatusUpdater.java b/operator/src/main/java/oracle/kubernetes/operator/DomainStatusUpdater.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/operator/src/main/java/oracle/kubernetes/operator/ServerStatusReader.java b/operator/src/main/java/oracle/kubernetes/operator/ServerStatusReader.java
@@ -72,7 +72,7 @@ public NextAction apply(Packet packet) {
       for (Map.Entry<String, ServerKubernetesObjects> entry : info.getServers().entrySet()) {
         String serverName = entry.getKey();
         ServerKubernetesObjects sko = entry.getValue();
-        if (sko != null) { // !! Impossible to have a null value in a concurrent map
+        if (sko != null) {
           V1Pod pod = sko.getPod().get();
           if (pod != null) {
             Packet p = packet.clone();
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/KubernetesUtils.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/KubernetesUtils.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/operator/src/main/java/oracle/kubernetes/operator/work/Packet.java b/operator/src/main/java/oracle/kubernetes/operator/work/Packet.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/operator/src/test/java/oracle/kubernetes/TestUtils.java b/operator/src/test/java/oracle/kubernetes/TestUtils.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/AsyncCallTestSupport.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/AsyncCallTestSupport.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 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.
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2018,2019 Oracle Corporation and/or its affiliates. All rights reserved.`
	`1`	`+// Copyright 2018, 2019 Oracle Corporation and/or its affiliates. All rights reserved.`
`2`	`2`	`// Licensed under the Universal Permissive License v 1.0 as shown at`
`3`	`3`	`// http://oss.oracle.com/licenses/upl.`
`4`	`4`