Skip to content

Commit 33dea09

Browse files
author
Tom Barnes
authored
Replace direct references to 'kubectl' and 'docker' executables with … (#3493)
* Replace direct references to 'kubectl' and 'docker' executables with KUBERNETES_CLI and WLSIMG_BUILDER respectively.
1 parent b0bea1c commit 33dea09

File tree

169 files changed

+1779
-1446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+1779
-1446
lines changed

‎buildDockerImage.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
2+
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
usage() {
@@ -11,7 +11,7 @@ Builds a container image for the Oracle WebLogic Kubernetes Operator.
1111
Parameters:
1212
-t: image name and tag in 'name:tag' format
1313
14-
Copyright (c) 2020, 2021, Oracle and/or its affiliates.
14+
Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1515
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
1616
1717
EOF
@@ -65,7 +65,7 @@ echo "Building image '$IMAGE_NAME' ..."
6565

6666
# BUILD THE IMAGE (replace all environment variables)
6767
BUILD_START=$(date '+%s')
68-
docker build $PROXY_SETTINGS -t $IMAGE_NAME -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
68+
${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS -t $IMAGE_NAME -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
6969
echo "There was an error building the image."
7070
exit 1
7171
}
@@ -76,13 +76,13 @@ echo ""
7676

7777
if [ $? -eq 0 ]; then
7878
cat << EOF
79-
WebLogic Kubernetes Operator Docker Image is ready:
79+
WebLogic Kubernetes Operator Image is ready:
8080
8181
--> $IMAGE_NAME
8282
8383
Build completed in $BUILD_ELAPSED seconds.
8484
8585
EOF
8686
else
87-
echo "WebLogic Kubernetes Operator container image was NOT successfully created. Check the output and correct any reported problems with the docker build operation."
88-
fi
87+
echo "WebLogic Kubernetes Operator container image was NOT successfully created. Check the output and correct any reported problems with the ${WLSIMG_BUILDER:-docker} build operation."
88+
fi

‎integration-tests/src/test/java/oracle/weblogic/domain/DomainSpec.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public DomainSpec withFluentdConfiguration(boolean watchIntrospectorLog, String
169169

170170
/**
171171
* Specifies the image for the monitoring exporter sidecar.
172-
* @param imageName the name of the docker image
172+
* @param imageName the name of the image
173173
*/
174174
public void setFluentdImage(String imageName) {
175175
assert fluentdSpecification != null : "May not set image without configuration";

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import static oracle.weblogic.kubernetes.TestConstants.ENCRYPION_PASSWORD_DEFAULT;
3232
import static oracle.weblogic.kubernetes.TestConstants.ENCRYPION_USERNAME_DEFAULT;
3333
import static oracle.weblogic.kubernetes.TestConstants.KIND_REPO;
34+
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
3435
import static oracle.weblogic.kubernetes.TestConstants.MII_APP_RESPONSE_V1;
3536
import static oracle.weblogic.kubernetes.TestConstants.MII_AUXILIARY_IMAGE_NAME;
3637
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME;
@@ -44,9 +45,9 @@
4445
import static oracle.weblogic.kubernetes.actions.ActionConstants.WORK_DIR;
4546
import static oracle.weblogic.kubernetes.actions.TestActions.buildAppArchive;
4647
import static oracle.weblogic.kubernetes.actions.TestActions.defaultAppParams;
47-
import static oracle.weblogic.kubernetes.actions.TestActions.dockerTag;
4848
import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
4949
import static oracle.weblogic.kubernetes.actions.TestActions.getOperatorPodName;
50+
import static oracle.weblogic.kubernetes.actions.TestActions.imageTag;
5051
import static oracle.weblogic.kubernetes.assertions.TestAssertions.appAccessibleInPod;
5152
import static oracle.weblogic.kubernetes.assertions.TestAssertions.doesDomainExist;
5253
import static oracle.weblogic.kubernetes.assertions.TestAssertions.domainExists;
@@ -61,7 +62,7 @@
6162
import static oracle.weblogic.kubernetes.utils.FileUtils.generateFileFromTemplate;
6263
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
6364
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
64-
import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
65+
import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
6566
import static oracle.weblogic.kubernetes.utils.LoggingUtil.checkPodLogContainsString;
6667
import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;
6768
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
@@ -136,7 +137,7 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
136137
// Note: This class must not be run in parallel with other class
137138
new Command()
138139
.withParams(new CommandParams()
139-
.command("kubectl delete crd domains.weblogic.oracle --ignore-not-found"))
140+
.command(KUBERNETES_CLI + " delete crd domains.weblogic.oracle --ignore-not-found"))
140141
.execute();
141142
}
142143

@@ -220,10 +221,10 @@ void testMultipleAuxImagesV8Domain() {
220221
"domain.yaml", templateMap));
221222
logger.info("Generated Domain Resource file {0}", targetDomainFile);
222223

223-
// run kubectl to create the domain
224-
logger.info("Run kubectl to create the domain");
224+
// run KUBERNETES_CLI to create the domain
225+
logger.info("Run " + KUBERNETES_CLI + " to create the domain");
225226
CommandParams params = new CommandParams().defaults();
226-
params.command("kubectl apply -f "
227+
params.command(KUBERNETES_CLI + " apply -f "
227228
+ Paths.get(WORK_DIR + "/domain.yaml").toString());
228229
boolean result = Command.withParams(params).execute();
229230
assertTrue(result, "Failed to create domain custom resource");
@@ -330,10 +331,10 @@ void testErrorPathV8DomainMissingWDTBinary() {
330331
"domain.yaml", templateMap));
331332
logger.info("Generated Domain Resource file {0}", targetDomainFile);
332333

333-
// run kubectl to create the domain
334-
logger.info("Run kubectl to create the domain");
334+
// run KUBERNETES_CLI to create the domain
335+
logger.info("Run " + KUBERNETES_CLI + " to create the domain");
335336
CommandParams params = new CommandParams().defaults();
336-
params.command("kubectl apply -f "
337+
params.command(KUBERNETES_CLI + " apply -f "
337338
+ Paths.get(WORK_DIR + "/domain.yaml").toString());
338339
boolean result = Command.withParams(params).execute();
339340
assertTrue(result, "Failed to create domain custom resource");
@@ -396,10 +397,10 @@ void testErrorPathV8DomainMissingDomainConfig() {
396397
"domain.yaml", templateMap));
397398
logger.info("Generated Domain Resource file {0}", targetDomainFile);
398399

399-
// run kubectl to create the domain
400-
logger.info("Run kubectl to create the domain");
400+
// run KUBERNETES_CLI to create the domain
401+
logger.info("Run " + KUBERNETES_CLI + " to create the domain");
401402
CommandParams params = new CommandParams().defaults();
402-
params.command("kubectl apply -f "
403+
params.command(KUBERNETES_CLI + " apply -f "
403404
+ Paths.get(WORK_DIR + "/domain.yaml").toString());
404405
boolean result = Command.withParams(params).execute();
405406
assertTrue(result, "Failed to create domain custom resource");
@@ -466,10 +467,10 @@ void testErrorPathV8DomainFilePermission() {
466467
"domain.yaml", templateMap));
467468
logger.info("Generated Domain Resource file {0}", targetDomainFile);
468469

469-
// run kubectl to create the domain
470-
logger.info("Run kubectl to create the domain");
470+
// run KUBERNETES_CLI to create the domain
471+
logger.info("Run " + KUBERNETES_CLI + " to create the domain");
471472
CommandParams params = new CommandParams().defaults();
472-
params.command("kubectl apply -f "
473+
params.command(KUBERNETES_CLI + " apply -f "
473474
+ Paths.get(WORK_DIR + "/domain.yaml").toString());
474475
boolean result = Command.withParams(params).execute();
475476
assertTrue(result, "Failed to create domain custom resource");
@@ -539,10 +540,10 @@ void testUpdateBaseImageV8AuxDomain() {
539540
"domain.yaml", templateMap));
540541
logger.info("Generated Domain Resource file {0}", targetDomainFile);
541542

542-
// run kubectl to create the domain
543-
logger.info("Run kubectl to create the domain");
543+
// run KUBERNETES_CLI to create the domain
544+
logger.info("Run " + KUBERNETES_CLI + " to create the domain");
544545
CommandParams params = new CommandParams().defaults();
545-
params.command("kubectl apply -f "
546+
params.command(KUBERNETES_CLI + " apply -f "
546547
+ Paths.get(WORK_DIR + "/domain.yaml").toString());
547548
boolean result = Command.withParams(params).execute();
548549
assertTrue(result, "Failed to create domain custom resource");
@@ -576,8 +577,8 @@ void testUpdateBaseImageV8AuxDomain() {
576577
+ (WEBLOGIC_IMAGE_NAME + ":" + imageTag).substring(TestConstants.BASE_IMAGES_REPO.length() + 1)
577578
: WEBLOGIC_IMAGE_NAME + ":" + imageTag;
578579

579-
dockerTag(imageName, imageUpdate);
580-
dockerLoginAndPushImageToRegistry(imageUpdate);
580+
imageTag(imageName, imageUpdate);
581+
imageRepoLoginAndPushImageToRegistry(imageUpdate);
581582

582583
StringBuffer patchStr = null;
583584
patchStr = new StringBuffer("[{");

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import static oracle.weblogic.kubernetes.utils.FileUtils.makeDirectories;
5151
import static oracle.weblogic.kubernetes.utils.ImageUtils.createImageAndVerify;
5252
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
53-
import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
53+
import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
5454
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
5555
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodReady;
5656
import static oracle.weblogic.kubernetes.utils.PodUtils.getPodCreationTime;
@@ -264,12 +264,12 @@ private static String createAndVerifyDomainImage() {
264264
COHERENCE_IMAGE_NAME, COHERENCE_MODEL_FILE,
265265
PROXY_SERVER_APP_NAME, COHERENCE_MODEL_PROP, domainUid);
266266

267-
// docker login and push image to docker registry if necessary
268-
dockerLoginAndPushImageToRegistry(domImage);
267+
// repo login and push image to registry if necessary
268+
imageRepoLoginAndPushImageToRegistry(domImage);
269269

270-
// create docker registry secret to pull the image from registry
270+
// create registry secret to pull the image from registry
271271
// this secret is used only for non-kind cluster
272-
logger.info("Create docker registry secret in namespace {0}", domainNamespace);
272+
logger.info("Create registry secret in namespace {0}", domainNamespace);
273273
createTestRepoSecret(domainNamespace);
274274

275275
return domImage;
@@ -291,7 +291,7 @@ private static void createAndVerifyDomain(String domImage) {
291291
String.format("create encryption secret failed for %s", encryptionSecretName));
292292

293293
// create domain and verify
294-
logger.info("Create model in image domain {0} in namespace {1} using docker image {2}",
294+
logger.info("Create model in image domain {0} in namespace {1} using image {2}",
295295
domainUid, domainNamespace, domImage);
296296
createDomainCrAndVerify(adminSecretName, domImage);
297297

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import static oracle.weblogic.kubernetes.utils.DomainUtils.deleteDomainResource;
2525
import static oracle.weblogic.kubernetes.utils.ImageUtils.createMiiImageAndVerify;
2626
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
27-
import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
27+
import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
2828
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
2929
import static oracle.weblogic.kubernetes.utils.PodUtils.verifyIntrospectorPodLogContainsExpectedErrorMsg;
3030
import static oracle.weblogic.kubernetes.utils.SecretUtils.createSecretWithUsernamePassword;
@@ -112,8 +112,8 @@ void testConsensusLeasingValidation() {
112112
String consensusLeasingImageName =
113113
createMiiImageAndVerify("consensus-leasing-image", modelfile, MII_BASIC_APP_NAME);
114114

115-
// docker login and push image to docker registry if necessary
116-
dockerLoginAndPushImageToRegistry(consensusLeasingImageName);
115+
// repo login and push image to registry if necessary
116+
imageRepoLoginAndPushImageToRegistry(consensusLeasingImageName);
117117

118118
// create the domain custom resource
119119
logger.info("Create domain resource {0} object in namespace {1} and verify that it is created",
@@ -146,8 +146,8 @@ void testDatabaseLeasingNoDatasourceValidation() {
146146
String modelfile = "model-database-leasing-clusterdomain-sampleapp.yaml";
147147
String databaseLeasingImageName = createMiiImageAndVerify("database-leasing-image", modelfile, MII_BASIC_APP_NAME);
148148

149-
// docker login and push image to docker registry if necessary
150-
dockerLoginAndPushImageToRegistry(databaseLeasingImageName);
149+
// repo login and push image to registry if necessary
150+
imageRepoLoginAndPushImageToRegistry(databaseLeasingImageName);
151151

152152
// create the domain custom resource
153153
logger.info("Create domain resource {0} object in namespace {1} and verify that it is created",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
6868
import static oracle.weblogic.kubernetes.utils.ImageUtils.createImageAndVerify;
6969
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
70-
import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
70+
import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
7171
import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;
7272
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
7373
import static oracle.weblogic.kubernetes.utils.PodUtils.getExternalServicePodName;
@@ -325,8 +325,8 @@ private static void buildApplicationsAndDomains() {
325325
WDT_IMAGE_NAME1, modelListDomain1, appSrcDirList1, WDT_MODEL_DOMAIN1_PROPS, PROPS_TEMP_DIR, domainUid1);
326326
logger.info("Created {0} image", domain1Image);
327327

328-
// docker login and push image to docker registry if necessary
329-
dockerLoginAndPushImageToRegistry(domain1Image);
328+
// repo login and push image to registry if necessary
329+
imageRepoLoginAndPushImageToRegistry(domain1Image);
330330

331331
// build the model file list for domain2
332332
final List<String> modelListDomain2 = Arrays.asList(
@@ -341,8 +341,8 @@ private static void buildApplicationsAndDomains() {
341341
WDT_IMAGE_NAME2, modelListDomain2, appSrcDirList2, WDT_MODEL_DOMAIN2_PROPS, PROPS_TEMP_DIR, domainUid2);
342342
logger.info("Created {0} image", domain2Image);
343343

344-
// docker login and push image to docker registry if necessary
345-
dockerLoginAndPushImageToRegistry(domain2Image);
344+
// repo login and push image to registry if necessary
345+
imageRepoLoginAndPushImageToRegistry(domain2Image);
346346

347347
//create domain1
348348
createDomain(domainUid1, domain1Namespace, domain1AdminSecretName, domain1Image);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
8383
import static oracle.weblogic.kubernetes.utils.ImageUtils.createMiiImageAndVerify;
8484
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
85-
import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
85+
import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
8686
import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;
8787
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
8888
import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchDomainResourceServerStartPolicy;
@@ -256,7 +256,7 @@ void testFmwModelInImageWithDbOperator() {
256256
false);
257257

258258
// push the image to a registry to make it accessible in multi-node cluster
259-
dockerLoginAndPushImageToRegistry(fmwMiiImage);
259+
imageRepoLoginAndPushImageToRegistry(fmwMiiImage);
260260

261261
// create the domain object
262262
DomainResource domain = FmwUtils.createDomainResource(fmwDomainUid,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import static oracle.weblogic.kubernetes.utils.DomainUtils.shutdownDomainAndVerify;
3333
import static oracle.weblogic.kubernetes.utils.FileUtils.doesFileExistInPod;
3434
import static oracle.weblogic.kubernetes.utils.ImageUtils.createImageAndVerify;
35-
import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
35+
import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
3636
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
3737
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
3838
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -290,7 +290,7 @@ private static String createAndPushMiiImage() {
290290
WEBLOGIC_IMAGE_TAG, WLS_DOMAIN_TYPE, true, null, false);
291291

292292
// docker login and push image to docker registry if necessary
293-
dockerLoginAndPushImageToRegistry(miiImage);
293+
imageRepoLoginAndPushImageToRegistry(miiImage);
294294

295295
return miiImage;
296296
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
3030
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
3131
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
32+
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
3233
import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
3334
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
3435
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
@@ -123,11 +124,11 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
123124
// delete existing CRD
124125
Command
125126
.withParams(new CommandParams()
126-
.command("kubectl delete crd domains.weblogic.oracle --ignore-not-found"))
127+
.command(KUBERNETES_CLI + " delete crd domains.weblogic.oracle --ignore-not-found"))
127128
.execute();
128129

129130
// install CRD
130-
String createCrdCommand = "kubectl create -f " + ITTESTS_DIR + "/../kubernetes/crd/" + CRD_V16;
131+
String createCrdCommand = KUBERNETES_CLI + " create -f " + ITTESTS_DIR + "/../kubernetes/crd/" + CRD_V16;
131132
logger.info("Creating CRD with command {0}", createCrdCommand);
132133
Command
133134
.withParams(new CommandParams().command(createCrdCommand))
@@ -208,7 +209,7 @@ private void createDomain(String domainNamespace) {
208209
String.format("create encryption secret failed for %s", encryptionSecretName));
209210

210211
// create domain and verify
211-
logger.info("Create model in image domain {0} in namespace {1} using docker image {2}",
212+
logger.info("Create model in image domain {0} in namespace {1} using image {2}",
212213
domainNamespace, domainUid, domainNamespace);
213214
createDomainCrAndVerify(domainNamespace, TEST_IMAGES_REPO_SECRET_NAME, adminSecretName, encryptionSecretName);
214215
}

0 commit comments

Comments
 (0)