Skip to content

Commit 1e69a91

Browse files
AdrianPadillaAdrianPadilla
committed
Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into OWLS-70638
2 parents 81ac2bd + 2523505 commit 1e69a91

File tree

5 files changed

+157
-7
lines changed

5 files changed

+157
-7
lines changed

‎kubernetes/src/test/java/oracle/kubernetes/operator/helm/CreateOperatorInputsValidationIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
public class CreateOperatorInputsValidationIT extends OperatorChartITBase {
1919

2020
private static final String MUTEX = "%s can not be present when %s is defined";
21-
21+
2222
private static final String MISSING = "%s %s must be specified";
2323

2424
private static final String WRONG_TYPE = "%s must be a %s : %s";
@@ -166,7 +166,7 @@ public void whenExternalRestNotEnabled_ignoreRelatedParameterErrors() throws Exc
166166

167167
assertThat(getProcessingError(), emptyString());
168168
}
169-
169+
170170
@Test
171171
public void whenRemoteDebugNodePortEnabled_reportMissingRelatedParameters() throws Exception {
172172
setProperty("remoteDebugNodePortEnabled", true);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
1+
// Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at
33
// http://oss.oracle.com/licenses/upl.
44

@@ -169,7 +169,7 @@ private static int runningServersCount(DomainPresenceInfo info) {
169169
* @param info
170170
* @return
171171
*/
172-
private static boolean creatingServers(DomainPresenceInfo info) {
172+
static boolean creatingServers(DomainPresenceInfo info) {
173173
Domain dom = info.getDomain();
174174
DomainSpec spec = dom.getSpec();
175175
List<Cluster> clusters = spec.getClusters();
@@ -178,7 +178,7 @@ private static boolean creatingServers(DomainPresenceInfo info) {
178178
// Are we starting a cluster?
179179
// NOTE: clusterServerStartPolicy == null indicates default policy
180180
for (Cluster cluster : clusters) {
181-
int replicaCount = cluster.getReplicas();
181+
int replicaCount = dom.getReplicaCount(cluster.getClusterName());
182182
String clusterServerStartPolicy = cluster.getServerStartPolicy();
183183
LOGGER.fine(
184184
"Start Policy: "

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

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
// Copyright 2019, Oracle Corporation and/or its affiliates. All rights reserved.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at
3+
// http://oss.oracle.com/licenses/upl.
4+
5+
package oracle.kubernetes.operator.helpers;
6+
7+
import static org.hamcrest.CoreMatchers.equalTo;
8+
import static org.junit.Assert.assertThat;
9+
10+
import io.kubernetes.client.models.V1ObjectMeta;
11+
import oracle.kubernetes.weblogic.domain.ClusterConfigurator;
12+
import oracle.kubernetes.weblogic.domain.DomainConfigurator;
13+
import oracle.kubernetes.weblogic.domain.DomainConfiguratorFactory;
14+
import oracle.kubernetes.weblogic.domain.ServerConfigurator;
15+
import oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants;
16+
import oracle.kubernetes.weblogic.domain.v2.Domain;
17+
import org.junit.Test;
18+
19+
public class JobHelperTest {
20+
21+
private static final String NS = "ns1";
22+
23+
@Test
24+
public void creatingServers_true_whenClusterReplicas_gt_0() {
25+
DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
26+
27+
configureCluster(domainPresenceInfo, "cluster1").withReplicas(1);
28+
29+
assertThat(JobHelper.creatingServers(domainPresenceInfo), equalTo(true));
30+
}
31+
32+
@Test
33+
public void creatingServers_false_whenClusterReplicas_is_0() {
34+
DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
35+
36+
configureCluster(domainPresenceInfo, "cluster1").withReplicas(0);
37+
38+
assertThat(JobHelper.creatingServers(domainPresenceInfo), equalTo(false));
39+
}
40+
41+
@Test
42+
public void creatingServers_true_whenDomainReplicas_gt_0_and_cluster_has_no_replicas() {
43+
DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
44+
45+
configureDomain(domainPresenceInfo).withDefaultReplicaCount(1);
46+
47+
configureCluster(domainPresenceInfo, "cluster1");
48+
49+
assertThat(JobHelper.creatingServers(domainPresenceInfo), equalTo(true));
50+
}
51+
52+
@Test
53+
public void creatingServers_false_whenDomainReplicas_is_0_and_cluster_has_no_replicas() {
54+
DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
55+
56+
configureDomain(domainPresenceInfo).withDefaultReplicaCount(0);
57+
58+
configureCluster(domainPresenceInfo, "cluster1");
59+
60+
assertThat(JobHelper.creatingServers(domainPresenceInfo), equalTo(false));
61+
}
62+
63+
@Test
64+
public void creatingServers_false_when_no_domain_nor_cluster_replicas() {
65+
DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
66+
67+
configureCluster(domainPresenceInfo, "cluster1");
68+
69+
assertThat(JobHelper.creatingServers(domainPresenceInfo), equalTo(false));
70+
}
71+
72+
@Test
73+
public void creatingServers_false_when_noCluster_and_START_NEVER_startPolicy() {
74+
DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
75+
76+
assertThat(JobHelper.creatingServers(domainPresenceInfo), equalTo(false));
77+
}
78+
79+
@Test
80+
public void creatingServers_true_when_noCluster_and_START_IF_NEEDED_startPolicy() {
81+
DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
82+
83+
configureDomain(domainPresenceInfo)
84+
.withDefaultServerStartPolicy(ConfigurationConstants.START_IF_NEEDED);
85+
86+
assertThat(JobHelper.creatingServers(domainPresenceInfo), equalTo(true));
87+
}
88+
89+
@Test
90+
public void creatingServers_true_when_noCluster_and_START_ALWAYS_startPolicy() {
91+
DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
92+
93+
configureDomain(domainPresenceInfo)
94+
.withDefaultServerStartPolicy(ConfigurationConstants.START_ALWAYS);
95+
96+
assertThat(JobHelper.creatingServers(domainPresenceInfo), equalTo(true));
97+
}
98+
99+
@Test
100+
public void creatingServers_false_when_server_with_START_NEVER_startPolicy() {
101+
DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
102+
103+
configureServer(domainPresenceInfo, "managed-server1")
104+
.withServerStartPolicy(ConfigurationConstants.START_NEVER);
105+
106+
assertThat(JobHelper.creatingServers(domainPresenceInfo), equalTo(false));
107+
}
108+
109+
@Test
110+
public void creatingServers_true_when_server_with_START_IF_NEEDED_startPolicy() {
111+
DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
112+
113+
configureServer(domainPresenceInfo, "managed-server1")
114+
.withServerStartPolicy(ConfigurationConstants.START_IF_NEEDED);
115+
116+
assertThat(JobHelper.creatingServers(domainPresenceInfo), equalTo(true));
117+
}
118+
119+
@Test
120+
public void creatingServers_true_when_server_with_START_AWLAYS_startPolicy() {
121+
DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
122+
123+
configureServer(domainPresenceInfo, "managed-server1")
124+
.withServerStartPolicy(ConfigurationConstants.START_ALWAYS);
125+
126+
assertThat(JobHelper.creatingServers(domainPresenceInfo), equalTo(true));
127+
}
128+
129+
private DomainPresenceInfo createDomainPresenceInfo() {
130+
DomainPresenceInfo domainPresenceInfo =
131+
new DomainPresenceInfo(new Domain().withMetadata(new V1ObjectMeta().namespace(NS)));
132+
configureDomain(domainPresenceInfo)
133+
.withDefaultServerStartPolicy(ConfigurationConstants.START_NEVER);
134+
return domainPresenceInfo;
135+
}
136+
137+
private DomainConfigurator configureDomain(DomainPresenceInfo domainPresenceInfo) {
138+
return DomainConfiguratorFactory.forDomain(domainPresenceInfo.getDomain());
139+
}
140+
141+
private ClusterConfigurator configureCluster(
142+
DomainPresenceInfo domainPresenceInfo, String clusterName) {
143+
return configureDomain(domainPresenceInfo).configureCluster(clusterName);
144+
}
145+
146+
private ServerConfigurator configureServer(
147+
DomainPresenceInfo domainPresenceInfo, String serverName) {
148+
return configureDomain(domainPresenceInfo).configureServer(serverName);
149+
}
150+
}

‎site/k8s_setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ If you need some help setting up a Kubernetes environment to experiment with the
1010
"Production" options:
1111

1212
* Set up your own Kubernetes environment on bare compute resources on a cloud.
13-
* Use you cloud provider's management console to provision a managed Kubernetes environment.
13+
* Use your cloud provider's management console to provision a managed Kubernetes environment.
1414
* Install Kubernetes on your own compute resources (for example, "real" computers, outside a cloud).
1515

1616
"Development/test" options:

‎src/scripts/initialize-external-operator-identity.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright 2019, Oracle Corporation and/or its affiliates. All rights reserved.
33
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44

5-
# do not turn on 'set -x' since it can print sensitive info, like secrets and private keys, to the oeprator log
5+
# do not turn on 'set -x' since it can print sensitive info, like secrets and private keys, to the operator log
66
#set -x
77

88
if [ "$#" != 0 ] ; then

0 commit comments

Comments
 (0)