Skip to content

Added anti affinity to the wls pods #2033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Nov 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getPodCreationTime;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
import static org.awaitility.Awaitility.with;
import static org.junit.jupiter.api.Assertions.assertAll;
Expand Down Expand Up @@ -362,7 +363,7 @@ private static void createDomainCrAndVerify(String adminSecretName, String domIm
.model(new Model()
.domainType("WLS"))
.introspectorJobActiveDeadlineSeconds(300L)));

setPodAntiAffinity(domain);
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
domainUid, domainNamespace);
boolean domCreated = assertDoesNotThrow(() -> createDomainCustomResource(domain),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getIntrospectJobName;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getPodCreationTime;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.DeployUtil.deployUsingWlst;
import static oracle.weblogic.kubernetes.utils.MySQLDBUtils.createMySQLDB;
import static oracle.weblogic.kubernetes.utils.TestUtils.getNextFreePort;
Expand Down Expand Up @@ -874,7 +875,7 @@ private void createDomain() {
.clusterName(clusterName)
.replicas(replicaCount)
.serverStartState("RUNNING")));

setPodAntiAffinity(domain);
// verify the domain custom resource is created
createDomainAndVerify(domain, domainNamespace);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getExternalServicePodName;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.DbUtils.startOracleDB;
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
Expand Down Expand Up @@ -459,7 +460,7 @@ private void createDomainResource(String domainUid, String domNamespace, String
.model(new Model()
.domainType("WLS"))
.introspectorJobActiveDeadlineSeconds(300L)));

setPodAntiAffinity(domain);
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
domainUid, domNamespace);
boolean domCreated = assertDoesNotThrow(() -> createDomainCustomResource(domain),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.scaleAndVerifyCluster;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand Down Expand Up @@ -355,7 +356,7 @@ private void createDomainCrAndVerify(String domainNamespace,
.model(new Model()
.domainType(WLS_DOMAIN_TYPE)
.runtimeEncryptionSecret(encryptionSecretName))));

setPodAntiAffinity(domain);
// create model in image domain
logger.info("Creating model in image domain {0} in namespace {1} using docker image {2}",
domainUid, domainNamespace, miiImage);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getExternalServicePodName;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.TestUtils.callWebAppAndWaitTillReady;
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
import static org.awaitility.Awaitility.with;
Expand Down Expand Up @@ -243,7 +244,7 @@ private static void createDomainResource(
.configMap(configmapName)
.runtimeEncryptionSecret(encryptionSecretName))
.introspectorJobActiveDeadlineSeconds(300L)));

setPodAntiAffinity(domain);
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
domainUid, domNamespace);
boolean domCreated = assertDoesNotThrow(() -> createDomainCustomResource(domain),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyKibana;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyWlsLoggingExporter;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.uninstallAndVerifyElasticsearch;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.uninstallAndVerifyKibana;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.verifyLoggingExporterReady;
Expand Down Expand Up @@ -434,7 +435,7 @@ private static void createDomainCrAndVerify(String adminSecretName,
.domainType("WLS")
.runtimeEncryptionSecret(encryptionSecretName))
.introspectorJobActiveDeadlineSeconds(300L)));

setPodAntiAffinity(domain);
// create domain using model in image
logger.info("Create model in image domain {0} in namespace {1} using docker image {2}",
domainUid, domainNamespace, miiImage);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.generateFileFromTemplate;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyVoyager;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
import static oracle.weblogic.kubernetes.utils.FileUtils.copyFileFromPod;
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
Expand Down Expand Up @@ -521,7 +522,7 @@ private static void createDomainResource(
.configMap(configmapName)
.runtimeEncryptionSecret(encryptionSecretName))
.introspectorJobActiveDeadlineSeconds(300L)));

setPodAntiAffinity(domain);
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
domainUid, domNamespace);
boolean domCreated = assertDoesNotThrow(() -> createDomainCustomResource(domain),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand Down Expand Up @@ -305,6 +306,7 @@ private void createAndVerifyMiiDomain(String domainNamespace, String domainUid,
.name("busybox")
.imagePullPolicy("IfNotPresent")
.image("busybox"));
setPodAntiAffinity(domain);
break;
case "adminServer":
domain.getSpec().getAdminServer().serverPod(new ServerPod()
Expand All @@ -313,6 +315,7 @@ private void createAndVerifyMiiDomain(String domainNamespace, String domainUid,
.name("busybox")
.imagePullPolicy("IfNotPresent")
.image("busybox")));
setPodAntiAffinity(domain);
break;
case "clusters":
clusters = domain.getSpec().getClusters();
Expand All @@ -321,12 +324,13 @@ private void createAndVerifyMiiDomain(String domainNamespace, String domainUid,
.filter(cluster -> clusterName.equals(cluster.getClusterName())).findAny()
.orElse(null);
assertNotNull(mycluster, "Can't find cluster " + clusterName);
mycluster.serverPod(new ServerPod()
setPodAntiAffinity(domain);
mycluster.getServerPod()
.addInitContainersItem(new V1Container()
.addCommandItem("echo").addArgsItem("\"Hi from Cluster \"")
.name("busybox")
.imagePullPolicy("IfNotPresent")
.image("busybox")));
.image("busybox"));
break;
case "managedServers":
domain.getSpec().addManagedServersItem(new ManagedServer()
Expand All @@ -337,6 +341,7 @@ private void createAndVerifyMiiDomain(String domainNamespace, String domainUid,
.name("busybox")
.imagePullPolicy("IfNotPresent")
.image("busybox"))));
setPodAntiAffinity(domain);
break;
default:
logger.info("no match for provided case {0}", testCaseName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getPodsWithTimeStamps;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyNginx;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.DeployUtil.deployUsingWlst;
import static oracle.weblogic.kubernetes.utils.TestUtils.getNextFreePort;
import static oracle.weblogic.kubernetes.utils.TestUtils.verifyServerCommunication;
Expand Down Expand Up @@ -333,7 +334,7 @@ public void testDomainIntrospectVersionNotRolling() {
.clusterName(clusterName)
.replicas(replicaCount)
.serverStartState("RUNNING")));

setPodAntiAffinity(domain);
// verify the domain custom resource is created
createDomainAndVerify(domain, introDomainNamespace);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.generateFileFromTemplate;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.DbUtils.startOracleDB;
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
import static oracle.weblogic.kubernetes.utils.IstioUtils.deployHttpIstioGatewayAndVirtualservice;
Expand Down Expand Up @@ -478,7 +479,7 @@ private void createDomainResource(String domainUid, String domNamespace, String
.model(new Model()
.domainType("WLS"))
.introspectorJobActiveDeadlineSeconds(300L)));

setPodAntiAffinity(domain);
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
domainUid, domNamespace);
boolean domCreated = assertDoesNotThrow(() -> createDomainCustomResource(domain),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.generateFileFromTemplate;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.IstioUtils.deployHttpIstioGatewayAndVirtualservice;
import static oracle.weblogic.kubernetes.utils.IstioUtils.deployIstioDestinationRule;
import static oracle.weblogic.kubernetes.utils.IstioUtils.getIstioHttpIngressPort;
Expand Down Expand Up @@ -271,7 +272,7 @@ private void createDomainResource(String domainUid, String domNamespace, String
.model(new Model()
.domainType("WLS"))
.introspectorJobActiveDeadlineSeconds(300L)));

setPodAntiAffinity(domain);
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
domainUid, domNamespace);
boolean domCreated = assertDoesNotThrow(() -> createDomainCustomResource(domain),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.generateFileFromTemplate;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.IstioUtils.deployHttpIstioGatewayAndVirtualservice;
import static oracle.weblogic.kubernetes.utils.IstioUtils.getIstioHttpIngressPort;
import static oracle.weblogic.kubernetes.utils.TestUtils.getNextFreePort;
Expand Down Expand Up @@ -258,7 +259,7 @@ public void testIstioDomainHomeInPv() {
.istio(new Istio()
.enabled(Boolean.TRUE)
.readinessPort(8888))));

setPodAntiAffinity(domain);
// verify the domain custom resource is created
createDomainAndVerify(domain, domainNamespace);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.generateFileFromTemplate;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.IstioUtils.deployHttpIstioGatewayAndVirtualservice;
import static oracle.weblogic.kubernetes.utils.IstioUtils.deployIstioDestinationRule;
import static oracle.weblogic.kubernetes.utils.IstioUtils.getIstioHttpIngressPort;
Expand Down Expand Up @@ -242,7 +243,7 @@ private Domain createDomainResource(String domainUid, String domNamespace,
String encryptionSecretName, int replicaCount, String miiImage) {

// create the domain CR
return new Domain()
Domain domain = new Domain()
.apiVersion(DOMAIN_API_VERSION)
.kind("Domain")
.metadata(new V1ObjectMeta()
Expand Down Expand Up @@ -280,6 +281,8 @@ private Domain createDomainResource(String domainUid, String domNamespace,
.domainType("WLS")
.runtimeEncryptionSecret(encryptionSecretName))
.introspectorJobActiveDeadlineSeconds(300L)));
setPodAntiAffinity(domain);
return domain;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.generateFileFromTemplate;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.IstioUtils.deployHttpIstioGatewayAndVirtualservice;
import static oracle.weblogic.kubernetes.utils.IstioUtils.deployIstioDestinationRule;
import static oracle.weblogic.kubernetes.utils.IstioUtils.getIstioHttpIngressPort;
Expand Down Expand Up @@ -350,7 +351,7 @@ private void createDomainResource(String domainUid, String domNamespace, String
.model(new Model()
.domainType("WLS"))
.introspectorJobActiveDeadlineSeconds(300L)));

setPodAntiAffinity(domain);
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
domainUid, domNamespace);
boolean domCreated = assertDoesNotThrow(() -> createDomainCustomResource(domain),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretForBaseImages;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
import static oracle.weblogic.kubernetes.utils.TestUtils.getNextFreePort;
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
Expand Down Expand Up @@ -270,7 +271,10 @@ public void testJrfDomainInPvUsingWlst() {
.addClustersItem(new Cluster() //cluster
.clusterName(clusterName)
.replicas(replicaCount)
.serverStartState("RUNNING")));
.serverStartState("RUNNING")
));

setPodAntiAffinity(domain);

// verify the domain custom resource is created
createDomainAndVerify(domain, jrfDomainNamespace);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.scaleAndVerifyCluster;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.upgradeAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
import static org.awaitility.Awaitility.with;
Expand Down Expand Up @@ -549,6 +550,7 @@ private Domain createDomainResource(String domainNamespace, String domainUid) {
.model(new Model()
.domainType(WLS_DOMAIN_TYPE)
.runtimeEncryptionSecret(encryptionSecretName))));
setPodAntiAffinity(domain);
return domain;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyVoyager;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installVoyagerIngressAndVerify;
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.with;
Expand Down Expand Up @@ -334,7 +335,7 @@ private static void createDomainCrAndVerify(String adminSecretName, String domIm
.model(new Model()
.domainType("WLS"))
.introspectorJobActiveDeadlineSeconds(300L)));

setPodAntiAffinity(domain);
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
domainUid, domainNamespace);
boolean domCreated = assertDoesNotThrow(() -> createDomainCustomResource(domain),
Expand Down
Loading