release lease and remove headless service changes

vanajamukkara · vanajamukkara · commit 2252a9b4ee84 · 2018-07-06T08:59:42.000-07:00
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ITFourthDomain.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ITFourthDomain.java
@@ -6,8 +6,12 @@
 
 import java.util.Properties;
 import oracle.kubernetes.operator.utils.Domain;
+import oracle.kubernetes.operator.utils.ExecCommand;
+import oracle.kubernetes.operator.utils.ExecResult;
 import oracle.kubernetes.operator.utils.Operator;
 import oracle.kubernetes.operator.utils.TestUtils;
+import org.junit.AfterClass;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -46,6 +50,9 @@ public class ITFourthDomain extends BaseTest {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
+    Assume.assumeTrue(
+        System.getenv("QUICK_TEST") == null
+            || System.getenv("QUICK_TEST").equalsIgnoreCase("false"));
     logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
     logger.info("BEGIN");
 
@@ -70,6 +77,41 @@ public static void staticPrepare() throws Exception {
     logger.info("SUCCESS");
   }
 
+  /**
+   * Shutdown operator and domain
+   *
+   * @throws Exception
+   */
+  @AfterClass
+  public static void staticUnPrepare() throws Exception {
+    logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
+    logger.info("BEGIN");
+    logger.info("Run once, shutdown/deleting operator, domain, pv, etc");
+    // shutdown operator, domain and cleanup all artifacts and pv dir
+    try {
+      if (domain != null) domain.destroy();
+      if (operator != null) operator.destroy();
+    } finally {
+      logger.info("Release the k8s cluster lease");
+      if (getLeaseId() != "") {
+        TestUtils.releaseLease(getProjectRoot(), getLeaseId());
+      }
+      String cmd =
+          "export RESULT_ROOT="
+              + getResultRoot()
+              + " export PV_ROOT="
+              + getPvRoot()
+              + " && "
+              + getProjectRoot()
+              + "/src/integration-tests/bash/cleanup.sh";
+      ExecResult result = ExecCommand.exec(cmd);
+      if (result.exitValue() != 0) {
+        logger.info("FAILED: command to call cleanup script " + cmd + " failed " + result.stderr());
+      }
+      logger.info("Command " + cmd + " returned " + result.stdout() + "\n" + result.stderr());
+    }
+    logger.info("SUCCESS");
+  }
   /**
    * verify domain1 is unaffected
    *
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ITSecondDomain.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ITSecondDomain.java
@@ -8,6 +8,7 @@
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.TestUtils;
 import org.junit.AfterClass;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -39,6 +40,9 @@ public class ITSecondDomain extends BaseTest {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
+    Assume.assumeTrue(
+        System.getenv("QUICK_TEST") == null
+            || System.getenv("QUICK_TEST").equalsIgnoreCase("false"));
     logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
     logger.info("BEGIN");
 
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ITSingleDomain.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ITSingleDomain.java
@@ -11,6 +11,7 @@
 import oracle.kubernetes.operator.utils.Operator;
 import oracle.kubernetes.operator.utils.TestUtils;
 import org.junit.AfterClass;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -80,32 +81,38 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if (System.getenv("QUICK_TEST") != null && System.getenv("QUICK_TEST").equals("true")) {
-      logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
-      logger.info("BEGIN");
-      logger.info("Run once, shutdown/deleting operator, domain, pv, etc");
-      // shutdown operator, domain and cleanup all artifacts and pv dir
-      try {
-        if (domain != null) domain.destroy();
-        if (operator != null) operator.destroy();
-      } finally {
-        String cmd =
-            "export RESULT_ROOT="
-                + getResultRoot()
-                + " export PV_ROOT="
-                + getPvRoot()
-                + " && "
-                + getProjectRoot()
-                + "/src/integration-tests/bash/cleanup.sh";
-        ExecResult result = ExecCommand.exec(cmd);
-        if (result.exitValue() != 0) {
-          logger.info(
-              "FAILED: command to call cleanup script " + cmd + " failed " + result.stderr());
-        }
-        logger.info("Command " + cmd + " returned " + result.stdout() + "\n" + result.stderr());
+    Assume.assumeTrue(
+        System.getenv("QUICK_TEST") != null
+            && System.getenv("QUICK_TEST").equalsIgnoreCase("true"));
+    logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
+    logger.info("BEGIN");
+    logger.info("Run once, shutdown/deleting operator, domain, pv, etc");
+
+    // shutdown operator, domain and cleanup all artifacts and pv dir
+    try {
+      if (domain != null) domain.destroy();
+      if (operator != null) operator.destroy();
+    } finally {
+      logger.info("Release the k8s cluster lease");
+      if (getLeaseId() != "") {
+        TestUtils.releaseLease(getProjectRoot(), getLeaseId());
       }
-      logger.info("SUCCESS");
+
+      String cmd =
+          "export RESULT_ROOT="
+              + getResultRoot()
+              + " export PV_ROOT="
+              + getPvRoot()
+              + " && "
+              + getProjectRoot()
+              + "/src/integration-tests/bash/cleanup.sh";
+      ExecResult result = ExecCommand.exec(cmd);
+      if (result.exitValue() != 0) {
+        logger.info("FAILED: command to call cleanup script " + cmd + " failed " + result.stderr());
+      }
+      logger.info("Command " + cmd + " returned " + result.stdout() + "\n" + result.stderr());
     }
+    logger.info("SUCCESS");
   }
 
   /**
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ITThirdDomain.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ITThirdDomain.java
@@ -8,6 +8,7 @@
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.TestUtils;
 import org.junit.AfterClass;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -39,6 +40,9 @@ public class ITThirdDomain extends BaseTest {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
+    Assume.assumeTrue(
+        System.getenv("QUICK_TEST") == null
+            || System.getenv("QUICK_TEST").equalsIgnoreCase("false"));
     logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
     logger.info("BEGIN");
 
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java b/integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java
@@ -412,6 +412,16 @@ public static void renewK8sClusterLease(String projectRoot, String leaseId) thro
     }
   }
 
+  public static void releaseLease(String projectRoot, String leaseId) throws Exception {
+    String cmd = projectRoot + "/src/integration-tests/bash/lease.sh -d " + leaseId;
+    ExecResult leaseResult = ExecCommand.exec(cmd);
+    if (leaseResult.exitValue() != 0) {
+      logger.info("FAILED: command to release lease " + cmd + " failed " + leaseResult.stderr());
+    }
+    logger.info(
+        "Command " + cmd + " returned " + leaseResult.stdout() + "\n" + leaseResult.stderr());
+  }
+
   private static Builder createRESTRequest(KeyStore myKeyStore, String url, String token) {
     // Create REST Client obj and verify it's not null
     Client javaClient =
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/ServiceHelper.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/ServiceHelper.java
@@ -97,9 +97,6 @@ protected V1ServiceSpec createServiceSpec() {
       if (isPublishNotReadyAddressesSupported()) {
         serviceSpec.setPublishNotReadyAddresses(Boolean.TRUE);
       }
-      if (nodePort == null) {
-        serviceSpec.clusterIP("None");
-      }
       return serviceSpec;
     }
 
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/ServiceHelperTest.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/ServiceHelperTest.java
@@ -442,7 +442,7 @@ public void whenNodePortSpecified_createServerServiceWithNodePort() {
   }
 
   private V1Service withNodePort(V1Service service, int nodePort) {
-    service.getSpec().type("NodePort").clusterIP(null);
+    service.getSpec().setType("NodePort");
     service
         .getSpec()
         .getPorts()
@@ -530,7 +530,7 @@ private ServerKubernetesObjects getServerKubernetesObjects() {
   }
 
   private V1ServiceSpec createServerServiceSpec() {
-    return createUntypedServerServiceSpec().type("ClusterIP").clusterIP("None");
+    return createUntypedServerServiceSpec().type("ClusterIP");
   }
 
   private V1ServiceSpec createUntypedServerServiceSpec() {

Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,6 @@ protected V1ServiceSpec createServiceSpec() {`
`97`	`97`	`if (isPublishNotReadyAddressesSupported()) {`
`98`	`98`	`serviceSpec.setPublishNotReadyAddresses(Boolean.TRUE);`
`99`	`99`	`}`
`100`		`- if (nodePort == null) {`
`101`		`- serviceSpec.clusterIP("None");`
`102`		`- }`
`103`	`100`	`return serviceSpec;`
`104`	`101`	`}`
`105`	`102`
Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ public void whenNodePortSpecified_createServerServiceWithNodePort() {`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`private V1Service withNodePort(V1Service service, int nodePort) {`
`445`		`- service.getSpec().type("NodePort").clusterIP(null);`
	`445`	`+ service.getSpec().setType("NodePort");`
`446`	`446`	`service`
`447`	`447`	`.getSpec()`
`448`	`448`	`.getPorts()`
`@@ -530,7 +530,7 @@ private ServerKubernetesObjects getServerKubernetesObjects() {`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`private V1ServiceSpec createServerServiceSpec() {`
`533`		`- return createUntypedServerServiceSpec().type("ClusterIP").clusterIP("None");`
	`533`	`+ return createUntypedServerServiceSpec().type("ClusterIP");`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`private V1ServiceSpec createUntypedServerServiceSpec() {`