Skip to content

Commit 2252a9b

Browse files
vanajamukkaravanajamukkara
committed
release lease and remove headless service changes
1 parent d4800ff commit 2252a9b

File tree

7 files changed

+93
-29
lines changed

7 files changed

+93
-29
lines changed

‎integration-tests/src/test/java/oracle/kubernetes/operator/ITFourthDomain.java

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@
66

77
import java.util.Properties;
88
import oracle.kubernetes.operator.utils.Domain;
9+
import oracle.kubernetes.operator.utils.ExecCommand;
10+
import oracle.kubernetes.operator.utils.ExecResult;
911
import oracle.kubernetes.operator.utils.Operator;
1012
import oracle.kubernetes.operator.utils.TestUtils;
13+
import org.junit.AfterClass;
14+
import org.junit.Assume;
1115
import org.junit.BeforeClass;
1216
import org.junit.Test;
1317

@@ -46,6 +50,9 @@ public class ITFourthDomain extends BaseTest {
4650
*/
4751
@BeforeClass
4852
public static void staticPrepare() throws Exception {
53+
Assume.assumeTrue(
54+
System.getenv("QUICK_TEST") == null
55+
|| System.getenv("QUICK_TEST").equalsIgnoreCase("false"));
4956
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
5057
logger.info("BEGIN");
5158

@@ -70,6 +77,41 @@ public static void staticPrepare() throws Exception {
7077
logger.info("SUCCESS");
7178
}
7279

80+
/**
81+
* Shutdown operator and domain
82+
*
83+
* @throws Exception
84+
*/
85+
@AfterClass
86+
public static void staticUnPrepare() throws Exception {
87+
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
88+
logger.info("BEGIN");
89+
logger.info("Run once, shutdown/deleting operator, domain, pv, etc");
90+
// shutdown operator, domain and cleanup all artifacts and pv dir
91+
try {
92+
if (domain != null) domain.destroy();
93+
if (operator != null) operator.destroy();
94+
} finally {
95+
logger.info("Release the k8s cluster lease");
96+
if (getLeaseId() != "") {
97+
TestUtils.releaseLease(getProjectRoot(), getLeaseId());
98+
}
99+
String cmd =
100+
"export RESULT_ROOT="
101+
+ getResultRoot()
102+
+ " export PV_ROOT="
103+
+ getPvRoot()
104+
+ " && "
105+
+ getProjectRoot()
106+
+ "/src/integration-tests/bash/cleanup.sh";
107+
ExecResult result = ExecCommand.exec(cmd);
108+
if (result.exitValue() != 0) {
109+
logger.info("FAILED: command to call cleanup script " + cmd + " failed " + result.stderr());
110+
}
111+
logger.info("Command " + cmd + " returned " + result.stdout() + "\n" + result.stderr());
112+
}
113+
logger.info("SUCCESS");
114+
}
73115
/**
74116
* verify domain1 is unaffected
75117
*

‎integration-tests/src/test/java/oracle/kubernetes/operator/ITSecondDomain.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import oracle.kubernetes.operator.utils.Domain;
99
import oracle.kubernetes.operator.utils.TestUtils;
1010
import org.junit.AfterClass;
11+
import org.junit.Assume;
1112
import org.junit.BeforeClass;
1213
import org.junit.Test;
1314

@@ -39,6 +40,9 @@ public class ITSecondDomain extends BaseTest {
3940
*/
4041
@BeforeClass
4142
public static void staticPrepare() throws Exception {
43+
Assume.assumeTrue(
44+
System.getenv("QUICK_TEST") == null
45+
|| System.getenv("QUICK_TEST").equalsIgnoreCase("false"));
4246
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
4347
logger.info("BEGIN");
4448

‎integration-tests/src/test/java/oracle/kubernetes/operator/ITSingleDomain.java

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import oracle.kubernetes.operator.utils.Operator;
1212
import oracle.kubernetes.operator.utils.TestUtils;
1313
import org.junit.AfterClass;
14+
import org.junit.Assume;
1415
import org.junit.BeforeClass;
1516
import org.junit.Test;
1617

@@ -80,32 +81,38 @@ public static void staticPrepare() throws Exception {
8081
*/
8182
@AfterClass
8283
public static void staticUnPrepare() throws Exception {
83-
if (System.getenv("QUICK_TEST") != null && System.getenv("QUICK_TEST").equals("true")) {
84-
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
85-
logger.info("BEGIN");
86-
logger.info("Run once, shutdown/deleting operator, domain, pv, etc");
87-
// shutdown operator, domain and cleanup all artifacts and pv dir
88-
try {
89-
if (domain != null) domain.destroy();
90-
if (operator != null) operator.destroy();
91-
} finally {
92-
String cmd =
93-
"export RESULT_ROOT="
94-
+ getResultRoot()
95-
+ " export PV_ROOT="
96-
+ getPvRoot()
97-
+ " && "
98-
+ getProjectRoot()
99-
+ "/src/integration-tests/bash/cleanup.sh";
100-
ExecResult result = ExecCommand.exec(cmd);
101-
if (result.exitValue() != 0) {
102-
logger.info(
103-
"FAILED: command to call cleanup script " + cmd + " failed " + result.stderr());
104-
}
105-
logger.info("Command " + cmd + " returned " + result.stdout() + "\n" + result.stderr());
84+
Assume.assumeTrue(
85+
System.getenv("QUICK_TEST") != null
86+
&& System.getenv("QUICK_TEST").equalsIgnoreCase("true"));
87+
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
88+
logger.info("BEGIN");
89+
logger.info("Run once, shutdown/deleting operator, domain, pv, etc");
90+
91+
// shutdown operator, domain and cleanup all artifacts and pv dir
92+
try {
93+
if (domain != null) domain.destroy();
94+
if (operator != null) operator.destroy();
95+
} finally {
96+
logger.info("Release the k8s cluster lease");
97+
if (getLeaseId() != "") {
98+
TestUtils.releaseLease(getProjectRoot(), getLeaseId());
10699
}
107-
logger.info("SUCCESS");
100+
101+
String cmd =
102+
"export RESULT_ROOT="
103+
+ getResultRoot()
104+
+ " export PV_ROOT="
105+
+ getPvRoot()
106+
+ " && "
107+
+ getProjectRoot()
108+
+ "/src/integration-tests/bash/cleanup.sh";
109+
ExecResult result = ExecCommand.exec(cmd);
110+
if (result.exitValue() != 0) {
111+
logger.info("FAILED: command to call cleanup script " + cmd + " failed " + result.stderr());
112+
}
113+
logger.info("Command " + cmd + " returned " + result.stdout() + "\n" + result.stderr());
108114
}
115+
logger.info("SUCCESS");
109116
}
110117

111118
/**

‎integration-tests/src/test/java/oracle/kubernetes/operator/ITThirdDomain.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import oracle.kubernetes.operator.utils.Domain;
99
import oracle.kubernetes.operator.utils.TestUtils;
1010
import org.junit.AfterClass;
11+
import org.junit.Assume;
1112
import org.junit.BeforeClass;
1213
import org.junit.Test;
1314

@@ -39,6 +40,9 @@ public class ITThirdDomain extends BaseTest {
3940
*/
4041
@BeforeClass
4142
public static void staticPrepare() throws Exception {
43+
Assume.assumeTrue(
44+
System.getenv("QUICK_TEST") == null
45+
|| System.getenv("QUICK_TEST").equalsIgnoreCase("false"));
4246
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
4347
logger.info("BEGIN");
4448

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,16 @@ public static void renewK8sClusterLease(String projectRoot, String leaseId) thro
412412
}
413413
}
414414

415+
public static void releaseLease(String projectRoot, String leaseId) throws Exception {
416+
String cmd = projectRoot + "/src/integration-tests/bash/lease.sh -d " + leaseId;
417+
ExecResult leaseResult = ExecCommand.exec(cmd);
418+
if (leaseResult.exitValue() != 0) {
419+
logger.info("FAILED: command to release lease " + cmd + " failed " + leaseResult.stderr());
420+
}
421+
logger.info(
422+
"Command " + cmd + " returned " + leaseResult.stdout() + "\n" + leaseResult.stderr());
423+
}
424+
415425
private static Builder createRESTRequest(KeyStore myKeyStore, String url, String token) {
416426
// Create REST Client obj and verify it's not null
417427
Client javaClient =

‎operator/src/main/java/oracle/kubernetes/operator/helpers/ServiceHelper.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ protected V1ServiceSpec createServiceSpec() {
9797
if (isPublishNotReadyAddressesSupported()) {
9898
serviceSpec.setPublishNotReadyAddresses(Boolean.TRUE);
9999
}
100-
if (nodePort == null) {
101-
serviceSpec.clusterIP("None");
102-
}
103100
return serviceSpec;
104101
}
105102

‎operator/src/test/java/oracle/kubernetes/operator/helpers/ServiceHelperTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ public void whenNodePortSpecified_createServerServiceWithNodePort() {
442442
}
443443

444444
private V1Service withNodePort(V1Service service, int nodePort) {
445-
service.getSpec().type("NodePort").clusterIP(null);
445+
service.getSpec().setType("NodePort");
446446
service
447447
.getSpec()
448448
.getPorts()
@@ -530,7 +530,7 @@ private ServerKubernetesObjects getServerKubernetesObjects() {
530530
}
531531

532532
private V1ServiceSpec createServerServiceSpec() {
533-
return createUntypedServerServiceSpec().type("ClusterIP").clusterIP("None");
533+
return createUntypedServerServiceSpec().type("ClusterIP");
534534
}
535535

536536
private V1ServiceSpec createUntypedServerServiceSpec() {

0 commit comments

Comments
 (0)