Skip to content

Commit bcc7053

Browse files
rjeberhardrjeberhard
committed
Merge branch 'repofix-42' into 'release/4.2'
use existing repos for adding images See merge request weblogic-cloud/weblogic-kubernetes-operator!4747
2 parents ff66537 + 16f9c56 commit bcc7053

File tree

7 files changed

+88
-76
lines changed

7 files changed

+88
-76
lines changed

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
6565
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
6666
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
67-
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
6867
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
6968
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER_PRIVATEIP;
7069
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
@@ -92,6 +91,7 @@
9291
import static oracle.weblogic.kubernetes.utils.BuildApplication.buildApplication;
9392
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
9493
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createIngressHostRouting;
94+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getDateAndTimeStamp;
9595
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getHostAndPort;
9696
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
9797
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getServiceExtIPAddrtOke;
@@ -986,18 +986,19 @@ private void createDomain() {
986986
File wlsModelPropFile = ItIntrospectVersion.createWdtPropertyFile(wlsModelFilePrefix,
987987
K8S_NODEPORT_HOST, t3ChannelPort);
988988
// create domainCreationImage
989-
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "configdist-domain-on-pv-image";
989+
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "wls-domain-on-pv-image";
990+
String domainCreationImagetag = getDateAndTimeStamp();
990991
// create image with model and wdt installation files
991992
WitParams witParams
992993
= new WitParams()
993994
.modelImageName(domainCreationImageName)
994-
.modelImageTag(MII_BASIC_IMAGE_TAG)
995+
.modelImageTag(domainCreationImagetag)
995996
.modelFiles(Collections.singletonList(MODEL_DIR + "/" + wlsModelFile))
996997
.modelVariableFiles(Collections.singletonList(wlsModelPropFile.getAbsolutePath()));
997-
createAndPushAuxiliaryImage(domainCreationImageName, MII_BASIC_IMAGE_TAG, witParams);
998+
createAndPushAuxiliaryImage(domainCreationImageName, domainCreationImagetag, witParams);
998999

9991000
DomainCreationImage domainCreationImage
1000-
= new DomainCreationImage().image(domainCreationImageName + ":" + MII_BASIC_IMAGE_TAG);
1001+
= new DomainCreationImage().image(domainCreationImageName + ":" + domainCreationImagetag);
10011002

10021003
// create a domain resource
10031004
logger.info("Creating domain custom resource");
@@ -1030,7 +1031,8 @@ private void createDomain() {
10301031
uniqueDomainHome,
10311032
2,
10321033
t3ChannelPort,
1033-
configuration);
1034+
configuration,
1035+
WEBLOGIC_IMAGE_TO_USE_IN_SPEC);
10341036
domain.spec().serverPod().addEnvItem(new V1EnvVar()
10351037
.name("JAVA_OPTIONS")
10361038
.value("-Dweblogic.debug.DebugSituationalConfig=true "

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.kubernetes.client.custom.Quantity;
2424
import io.kubernetes.client.custom.V1Patch;
2525
import io.kubernetes.client.openapi.ApiException;
26-
import io.kubernetes.client.openapi.models.V1Container;
2726
import io.kubernetes.client.openapi.models.V1EnvVar;
2827
import io.kubernetes.client.openapi.models.V1Ingress;
2928
import io.kubernetes.client.openapi.models.V1LocalObjectReference;
@@ -121,6 +120,7 @@
121120
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createIngressHostRouting;
122121
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.formatIPv6Host;
123122
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.generateNewModelFileWithUpdatedDomainUid;
123+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getDateAndTimeStamp;
124124
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getHostAndPort;
125125
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
126126
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
@@ -129,7 +129,6 @@
129129
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.verifyServerCommunication;
130130
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withStandardRetryPolicy;
131131
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapAndVerify;
132-
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapForDomainCreation;
133132
import static oracle.weblogic.kubernetes.utils.DeployUtil.deployUsingWlst;
134133
import static oracle.weblogic.kubernetes.utils.DomainUtils.checkDomainStatusConditionTypeExists;
135134
import static oracle.weblogic.kubernetes.utils.DomainUtils.checkDomainStatusConditionTypeHasExpectedStatus;
@@ -140,7 +139,6 @@
140139
import static oracle.weblogic.kubernetes.utils.ImageUtils.createMiiImageAndVerify;
141140
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
142141
import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
143-
import static oracle.weblogic.kubernetes.utils.JobUtils.createDomainJob;
144142
import static oracle.weblogic.kubernetes.utils.JobUtils.getIntrospectJobName;
145143
import static oracle.weblogic.kubernetes.utils.K8sEvents.DOMAIN_ROLL_COMPLETED;
146144
import static oracle.weblogic.kubernetes.utils.K8sEvents.DOMAIN_ROLL_STARTING;
@@ -1152,18 +1150,19 @@ private static void createDomain() {
11521150
File wlsModelPropFile = createWdtPropertyFile(wlsModelFilePrefix, K8S_NODEPORT_HOST, t3ChannelPort);
11531151

11541152
// create domainCreationImage
1155-
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "introspect-domain-on-pv-image";
1153+
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "wls-domain-on-pv-image";
1154+
String domainCreationImagetag = getDateAndTimeStamp();
11561155
// create image with model and wdt installation files
11571156
WitParams witParams
11581157
= new WitParams()
11591158
.modelImageName(domainCreationImageName)
1160-
.modelImageTag(MII_BASIC_IMAGE_TAG)
1159+
.modelImageTag(domainCreationImagetag)
11611160
.modelFiles(Collections.singletonList(MODEL_DIR + "/" + wlsModelFile))
11621161
.modelVariableFiles(Collections.singletonList(wlsModelPropFile.getAbsolutePath()));
1163-
createAndPushAuxiliaryImage(domainCreationImageName, MII_BASIC_IMAGE_TAG, witParams);
1162+
createAndPushAuxiliaryImage(domainCreationImageName, domainCreationImagetag, witParams);
11641163

11651164
DomainCreationImage domainCreationImage
1166-
= new DomainCreationImage().image(domainCreationImageName + ":" + MII_BASIC_IMAGE_TAG);
1165+
= new DomainCreationImage().image(domainCreationImageName + ":" + domainCreationImagetag);
11671166

11681167
// create a domain resource
11691168
logger.info("Creating domain custom resource");
@@ -1194,7 +1193,8 @@ private static void createDomain() {
11941193
uniqueDomainHome,
11951194
cluster1ReplicaCount,
11961195
t3ChannelPort,
1197-
configuration);
1196+
configuration,
1197+
WEBLOGIC_IMAGE_TO_USE_IN_SPEC);
11981198

11991199
setPodAntiAffinity(domain);
12001200
// verify the domain custom resource is created
@@ -1253,48 +1253,6 @@ private static void createDomain() {
12531253
verifyMemberHealth(adminServerPodName, managedServerNames, wlsUserName, wlsPassword);
12541254
}
12551255

1256-
1257-
/**
1258-
* Create a WebLogic domain on a persistent volume by doing the following.
1259-
* Create a configmap containing WLST script and property file.
1260-
* Create a Kubernetes job to create domain on persistent volume.
1261-
*
1262-
* @param wlstScriptFile python script to create domain
1263-
* @param domainPropertiesFile properties file containing domain configuration
1264-
* @param pvName name of the persistent volume to create domain in
1265-
* @param pvcName name of the persistent volume claim
1266-
* @param namespace name of the domain namespace in which the job is created
1267-
*/
1268-
private static void createDomainOnPVUsingWlst(Path wlstScriptFile, Path domainPropertiesFile,
1269-
String pvName, String pvcName, String namespace) {
1270-
logger.info("Preparing to run create domain job using WLST");
1271-
1272-
List<Path> domainScriptFiles = new ArrayList<>();
1273-
domainScriptFiles.add(wlstScriptFile);
1274-
domainScriptFiles.add(domainPropertiesFile);
1275-
1276-
logger.info("Creating a config map to hold domain creation scripts");
1277-
String domainScriptConfigMapName = "create-domain-scripts-cm";
1278-
assertDoesNotThrow(
1279-
() -> createConfigMapForDomainCreation(
1280-
domainScriptConfigMapName, domainScriptFiles, namespace, ItIntrospectVersion.class.getSimpleName()),
1281-
"Create configmap for domain creation failed");
1282-
1283-
// create a V1Container with specific scripts and properties for creating domain
1284-
V1Container jobCreationContainer = new V1Container()
1285-
.addCommandItem("/bin/sh")
1286-
.addArgsItem("/u01/oracle/oracle_common/common/bin/wlst.sh")
1287-
.addArgsItem("/u01/weblogic/" + wlstScriptFile.getFileName()) //wlst.sh script
1288-
.addArgsItem("-skipWLSModuleScanning")
1289-
.addArgsItem("-loadProperties")
1290-
.addArgsItem("/u01/weblogic/" + domainPropertiesFile.getFileName()); //domain property file
1291-
1292-
logger.info("Running a Kubernetes job to create the domain");
1293-
createDomainJob(WEBLOGIC_IMAGE_TO_USE_IN_SPEC, pvName, pvcName, domainScriptConfigMapName,
1294-
namespace, jobCreationContainer);
1295-
1296-
}
1297-
12981256
private static void verifyMemberHealth(String adminServerPodName, List<String> managedServerNames,
12991257
String user, String code) {
13001258

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
import static oracle.weblogic.kubernetes.TestConstants.FAILURE_RETRY_LIMIT_MINUTES;
6060
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
6161
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
62-
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
6362
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
6463
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
6564
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
@@ -85,6 +84,7 @@
8584
import static oracle.weblogic.kubernetes.utils.ClusterUtils.removeReplicasSettingAndVerify;
8685
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
8786
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
87+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getDateAndTimeStamp;
8888
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
8989
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
9090
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
@@ -776,18 +776,19 @@ private static DomainResource createDomain(String domainNamespace, String domain
776776
K8S_NODEPORT_HOST, t3ChannelPort);
777777

778778
// create domainCreationImage
779-
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "events-domain-on-pv-image";
779+
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "wls-domain-on-pv-image";
780+
String domainCreationImagetag = getDateAndTimeStamp();
780781
// create image with model and wdt installation files
781782
WitParams witParams
782783
= new WitParams()
783784
.modelImageName(domainCreationImageName)
784-
.modelImageTag(MII_BASIC_IMAGE_TAG)
785+
.modelImageTag(domainCreationImagetag)
785786
.modelFiles(Collections.singletonList(MODEL_DIR + "/" + wlsModelFile))
786787
.modelVariableFiles(Collections.singletonList(wlsModelPropFile.getAbsolutePath()));
787-
createAndPushAuxiliaryImage(domainCreationImageName, MII_BASIC_IMAGE_TAG, witParams);
788+
createAndPushAuxiliaryImage(domainCreationImageName, domainCreationImagetag, witParams);
788789

789790
DomainCreationImage domainCreationImage
790-
= new DomainCreationImage().image(domainCreationImageName + ":" + MII_BASIC_IMAGE_TAG);
791+
= new DomainCreationImage().image(domainCreationImageName + ":" + domainCreationImagetag);
791792

792793
// create a domain resource
793794
logger.info("Creating domain custom resource");

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSystemResOverrides.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
5959
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
6060
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
61-
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
6261
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
6362
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
6463
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
@@ -81,6 +80,7 @@
8180
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
8281
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createIngressHostRouting;
8382
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.exeAppInServerPod;
83+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getDateAndTimeStamp;
8484
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getHostAndPort;
8585
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
8686
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
@@ -397,18 +397,19 @@ private void createDomain() {
397397
K8S_NODEPORT_HOST, t3ChannelPort);
398398

399399
// create domainCreationImage
400-
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "sitconfig-domain-on-pv-image";
400+
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "wls-domain-on-pv-image";
401+
String domainCreationImagetag = getDateAndTimeStamp();
401402
// create image with model and wdt installation files
402403
WitParams witParams
403404
= new WitParams()
404405
.modelImageName(domainCreationImageName)
405-
.modelImageTag(MII_BASIC_IMAGE_TAG)
406+
.modelImageTag(domainCreationImagetag)
406407
.modelFiles(Collections.singletonList(MODEL_DIR + "/" + wlsModelFile))
407408
.modelVariableFiles(Collections.singletonList(wlsModelPropFile.getAbsolutePath()));
408-
createAndPushAuxiliaryImage(domainCreationImageName, MII_BASIC_IMAGE_TAG, witParams);
409+
createAndPushAuxiliaryImage(domainCreationImageName, domainCreationImagetag, witParams);
409410

410411
DomainCreationImage domainCreationImage
411-
= new DomainCreationImage().image(domainCreationImageName + ":" + MII_BASIC_IMAGE_TAG);
412+
= new DomainCreationImage().image(domainCreationImageName + ":" + domainCreationImagetag);
412413

413414
// create a domain resource
414415
logger.info("Creating domain custom resource");

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItT3Channel.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
6262
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
6363
import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
64-
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
6564
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
6665
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
6766
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
@@ -75,6 +74,7 @@
7574
import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterResource;
7675
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
7776
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createIngressHostRouting;
77+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getDateAndTimeStamp;
7878
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
7979
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
8080
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
@@ -178,18 +178,19 @@ void testAdminServerT3Channel() {
178178
K8S_NODEPORT_HOST, t3ChannelPort);
179179

180180
// create domainCreationImage
181-
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "t3channel-domain-on-pv-image";
181+
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "wls-domain-on-pv-image";
182+
String domainCreationImagetag = getDateAndTimeStamp();
182183
// create image with model and wdt installation files
183184
WitParams witParams
184185
= new WitParams()
185186
.modelImageName(domainCreationImageName)
186-
.modelImageTag(MII_BASIC_IMAGE_TAG)
187+
.modelImageTag(domainCreationImagetag)
187188
.modelFiles(Collections.singletonList(MODEL_DIR + "/" + wlsModelFile))
188189
.modelVariableFiles(Collections.singletonList(wlsModelPropFile.getAbsolutePath()));
189-
createAndPushAuxiliaryImage(domainCreationImageName, MII_BASIC_IMAGE_TAG, witParams);
190+
createAndPushAuxiliaryImage(domainCreationImageName, domainCreationImagetag, witParams);
190191

191192
DomainCreationImage domainCreationImage
192-
= new DomainCreationImage().image(domainCreationImageName + ":" + MII_BASIC_IMAGE_TAG);
193+
= new DomainCreationImage().image(domainCreationImageName + ":" + domainCreationImagetag);
193194

194195
// create a domain resource
195196
logger.info("Creating domain custom resource");

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DomainUtils.java

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ public static DomainResource createDomainResourceForDomainOnPV(String domainUid,
968968
}
969969

970970
/**
971-
* Utility to create domain resource on pv with confiiguration.
971+
* Utility to create domain resource on pv with configuration.
972972
* @param domainUid domain uid
973973
* @param domNamespace domain namespace
974974
* @param adminSecretName wls admin secret name
@@ -993,6 +993,48 @@ public static DomainResource createDomainResourceOnPv(String domainUid,
993993
int replicaCount,
994994
int t3ChannelPort,
995995
Configuration configuration) {
996+
return createDomainResourceOnPv(domainUid,
997+
domNamespace,
998+
adminSecretName,
999+
clusterName,
1000+
pvName,
1001+
pvcName,
1002+
repoSecretName,
1003+
domainInHomePrefix,
1004+
replicaCount,
1005+
t3ChannelPort,
1006+
configuration,
1007+
FMWINFRA_IMAGE_TO_USE_IN_SPEC);
1008+
}
1009+
1010+
/**
1011+
* Utility to create domain resource on pv with configuration.
1012+
* @param domainUid domain uid
1013+
* @param domNamespace domain namespace
1014+
* @param adminSecretName wls admin secret name
1015+
* @param clusterName cluster name
1016+
* @param pvName PV name
1017+
* @param pvcName PVC name
1018+
* @param repoSecretName name of the secret for pulling the WebLogic image
1019+
* @param domainInHomePrefix domain in home prefix
1020+
* @param replicaCount repica count of the clsuter
1021+
* @param t3ChannelPort t3 chanel
1022+
* @param configuration domain configuratioin object
1023+
* @param imageToUse base image to use
1024+
* @return oracle.weblogic.domain.Domain object
1025+
*/
1026+
public static DomainResource createDomainResourceOnPv(String domainUid,
1027+
String domNamespace,
1028+
String adminSecretName,
1029+
String clusterName,
1030+
String pvName,
1031+
String pvcName,
1032+
String[] repoSecretName,
1033+
String domainInHomePrefix,
1034+
int replicaCount,
1035+
int t3ChannelPort,
1036+
Configuration configuration,
1037+
String imageToUse) {
9961038

9971039
// create secrets
9981040
List<V1LocalObjectReference> secrets = new ArrayList<>();
@@ -1011,7 +1053,7 @@ public static DomainResource createDomainResourceOnPv(String domainUid,
10111053
.domainUid(domainUid)
10121054
.domainHome(domainInHomePrefix + domainUid)
10131055
.domainHomeSourceType("PersistentVolume")
1014-
.image(FMWINFRA_IMAGE_TO_USE_IN_SPEC)
1056+
.image(imageToUse)
10151057
.imagePullPolicy(IMAGE_PULL_POLICY)
10161058
.webLogicCredentialsSecret(new V1LocalObjectReference()
10171059
.name(adminSecretName))

0 commit comments

Comments
 (0)