Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into develop-REST-cert-chain-tests

Author: AdrianPadilla

README.md

@@ -1,8 +1,8 @@
 # Oracle WebLogic Server Kubernetes Operator
 
-Built with [Wercker](http://www.wercker.com)
+Built with [Jenkins](http://build.weblogick8s.org:8080/job/weblogic-kubernetes-operator/)
 
-[![wercker status](https://app.wercker.com/status/68ce42623fce7fb2e52d304de8ea7530/m/develop "wercker status")](https://app.wercker.com/project/byKey/68ce42623fce7fb2e52d304de8ea7530)
+[![Build Status](http://build.weblogick8s.org:8080/buildStatus/icon?job=weblogic-kubernetes-operator)](http://build.weblogick8s.org:8080/job/weblogic-kubernetes-operator/)
 
 Oracle is finding ways for organizations using WebLogic Server to run important workloads, to move those workloads into the cloud. By certifying on industry standards, such as Docker and Kubernetes, WebLogic now runs in a cloud neutral infrastructure. In addition, we've provided an open-source Oracle WebLogic Server Kubernetes Operator (the “operator”) which has several key features to assist you with deploying and managing WebLogic domains in a Kubernetes environment. You can:
 

build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/customized_google_checks.xml

@@ -53,7 +53,6 @@
             <property name="tokens"
              value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
-        <module name="NeedBraces"/>
         <module name="LeftCurly"/>
         <module name="RightCurly">
             <property name="id" value="RightCurlySame"/>
@@ -192,10 +191,9 @@
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
         <module name="CustomImportOrder">
-            <property name="specialImportsRegExp" value="com.oracle"/>
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
+            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
         </module>
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceBefore">
@@ -254,5 +252,4 @@
         </module>
         <module name="CommentsIndentation"/>
     </module>
-</module>
-
+</module>

buildtime-reports/pom.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>operator-parent</artifactId>
+        <groupId>oracle.kubernetes</groupId>
+        <version>2.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>buildtime-reports</artifactId>
+    <packaging>pom</packaging>
+    <name>Project Reports</name>
+
+    <profiles>
+        <profile>
+            <id>reports</id>
+            <activation>
+                <property>
+                  <name>!no-reports</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>${jacoco.version}</version>
+                        <executions>
+                            <execution>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>report-aggregate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>operator-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>weblogic-kubernetes-operator</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>operator-integration-tests</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

@@ -35,6 +35,7 @@ public class ITOperator extends BaseTest {
   private static final String opForDelYamlFile1 = "operator_del1.yaml";
   private static final String opForDelYamlFile2 = "operator_del2.yaml";
   private static final String opForBackwardCompatibility = "operator_bc.yaml";
+  private static final String opForRESTCertChain = "operator_chain.yaml";
 
   // property file used to customize domain properties for domain inputs yaml
   private static String domain1YamlFile = "domain1.yaml";
@@ -62,6 +63,7 @@ public class ITOperator extends BaseTest {
   private static Operator operatorForDel2;
 
   private static Operator operatorForBackwardCompatibility;
+  private static Operator operatorForRESTCertChain;
 
   private static boolean QUICKTEST;
   private static boolean SMOKETEST;
@@ -404,7 +406,7 @@ public void test8CreateDomainOnExistingDir() throws Exception {
    *
    * @throws Exception
    */
-  // @Test
+  // //@DisabledTest
   public void testACreateDomainApacheLB() throws Exception {
     Assume.assumeFalse(QUICKTEST);
 
@@ -620,13 +622,11 @@ public void testOperatorRESTUsingCertificateChain() throws Exception {
 
     logTestBegin("testOperatorRESTUsingCertificateChain");
     logger.info("Checking if operatorForBackwardCompatibility is running, if not creating");
-    if (operatorForBackwardCompatibility == null) {
-      operatorForBackwardCompatibility =
-          TestUtils.createOperator(opForBackwardCompatibility, RESTCertType.CHAIN);
+    if (operatorForRESTCertChain == null) {
+      operatorForRESTCertChain = TestUtils.createOperator(opForRESTCertChain, RESTCertType.CHAIN);
     }
-    operatorForBackwardCompatibility.verifyOperatorExternalRESTEndpoint();
+    operatorForRESTCertChain.verifyOperatorExternalRESTEndpoint();
     logger.info("Operator using legacy REST identity created successfully");
-    operatorForBackwardCompatibility.destroy();
     logger.info("SUCCESS - testOperatorRESTUsingCertificateChain");
   }
 

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java

@@ -308,9 +308,6 @@ private void generateInputYaml() throws Exception {
         sb.append(operatorNS);
         break;
     }
-    if (RESTCertType.LEGACY.equals(restCertType)) {
-    } else {
-    }
     sb.append(" DNS:");
     sb.append(TestUtils.getHostName());
     sb.append(" >> ");

integration-tests/src/test/resources/operator_chain.yaml

@@ -0,0 +1,11 @@
+# Copyright 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.
+
+#any property can be provided here from kubernetes/charts/weblogic-operator/values.yaml
+releaseName: op4
+serviceAccount: weblogic-operator
+namespace: weblogic-operator-cert-chain
+domainNamespaces: [ "domain-operator-cert-chain"]
+externalRestEnabled: true
+externalRestHttpsPort: 32005
+javaLoggingLevel: FINE

integration-tests/src/test/resources/scripts/generate-external-rest-identity-chain.sh

@@ -122,7 +122,6 @@ keytool \
    -validity 10000 \
    -keyalg RSA \
    -keysize 2048 \
-   -ext bc:c \
    -keystore ${ROOT_JKS} \
    -keypass ${TEMP_PW} \
    -storepass ${TEMP_PW}
@@ -134,7 +133,6 @@ keytool \
    -validity 10000 \
    -keyalg RSA \
    -keysize 2048 \
-   -ext bc:c \
    -keystore ${CA_JKS} \
    -keypass ${TEMP_PW} \
    -storepass ${TEMP_PW}
@@ -149,6 +147,13 @@ keytool \
    -storepass ${TEMP_PW} \
    > ${OP_ROOT_PEM}
 
+keytool \
+   -keystore ${CA_JKS} \
+   -storepass ${TEMP_PW} \
+   -importcert \
+   -noprompt \
+   -alias ${ROOT_ALIAS} \
+   -file ${OP_ROOT_PEM}
 # generate a certificate for operator-ca signed by operator-root (operator-root -> operator-ca)
 
 keytool \
@@ -167,15 +172,6 @@ keytool \
    > ${OP_CA_PEM}
 
 # import operator-ca cert chain into operator-ca.jks
-
-keytool \
-   -keystore ${CA_JKS} \
-   -storepass ${TEMP_PW} \
-   -importcert \
-   -trustcacerts \
-   -noprompt \
-   -alias ${ROOT_ALIAS} \
-   -file ${OP_ROOT_PEM}
 
 keytool \
    -keystore ${CA_JKS} \
@@ -184,7 +180,7 @@ keytool \
    -alias ${CA_ALIAS} \
    -file ${OP_CA_PEM}
 
-# generate private keys (for server)
+# generate private keys (for operator)
 
 keytool \
   -genkeypair \
@@ -200,7 +196,7 @@ keytool \
   -ext SAN="${SANS}" \
 2> /dev/null
 
-# generate a certificate for server signed by operator-ca (operator-root -> operator-ca -> weblogic-operator)
+# generate a certificate for operator signed by operator-ca (operator-root -> operator-ca -> weblogic-operator)
 
 keytool \
    -keystore ${OP_JKS} \

operator/src/main/java/oracle/kubernetes/operator/Main.java

@@ -1,4 +1,4 @@
-// Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2017, 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.
 
@@ -478,7 +478,7 @@ public void run() {
     try {
       shutdownSignal.acquire();
     } catch (InterruptedException ignore) {
-      // ignoring
+      Thread.currentThread().interrupt();
     }
 
     isNamespaceStopping.forEach(

operator/src/main/java/oracle/kubernetes/operator/ServerStatusReader.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.
 
@@ -162,7 +162,9 @@ public NextAction apply(Packet packet) {
                   state = CharStreams.toString(reader);
                 }
               }
-            } catch (IOException | ApiException | InterruptedException e) {
+            } catch (InterruptedException ignore) {
+              Thread.currentThread().interrupt();
+            } catch (IOException | ApiException e) {
               LOGGER.warning(MessageKeys.EXCEPTION, e);
             } finally {
               helper.recycle(client);

operator/src/main/java/oracle/kubernetes/operator/Watcher.java

@@ -78,7 +78,8 @@ void waitForExit() {
       if (thread != null) {
         thread.join();
       }
-    } catch (InterruptedException ignored) {
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
     }
   }
 
@@ -128,6 +129,7 @@ private void watchForEvents() {
         Thread.sleep(delay);
       } catch (InterruptedException ex) {
         LOGGER.warning(MessageKeys.EXCEPTION, ex);
+        Thread.currentThread().interrupt();
       }
       lastInitialize = System.currentTimeMillis();
     } else {