Skip to content

Commit 79f9f95

Browse files
jshum2479jshum2479
committed
Merge branch 'xc-117554' into 'release/4.2'
[backport] [podman] backport MR 4639, 4643 and 4645 to release/4.2 See merge request weblogic-cloud/weblogic-kubernetes-operator!4677
2 parents d8271af + 15d11b5 commit 79f9f95

File tree

9 files changed

+116
-54
lines changed

9 files changed

+116
-54
lines changed

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

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
// Copyright (c) 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2023, 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes;
55

6+
import java.net.InetAddress;
67
import java.util.HashMap;
78
import java.util.List;
89
import java.util.Map;
@@ -37,12 +38,16 @@
3738
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
3839
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_PREFIX;
3940
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
41+
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
4042
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_NAME;
4143
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_REGISTRY;
4244
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_TAG;
45+
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_NAMESPACE;
4346
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_RELEASE_NAME;
4447
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
4548
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
49+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
50+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER_DEFAULT;
4651
import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_DOWNLOAD_URL;
4752
import static oracle.weblogic.kubernetes.actions.ActionConstants.WIT_DOWNLOAD_URL;
4853
import static oracle.weblogic.kubernetes.actions.ActionConstants.WIT_JAVA_HOME;
@@ -56,6 +61,7 @@
5661
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
5762
import static oracle.weblogic.kubernetes.utils.SampleUtils.createPVHostPathAndChangePermissionInKindCluster;
5863
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
64+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
5965
import static org.junit.jupiter.api.Assertions.assertNotNull;
6066
import static org.junit.jupiter.api.Assertions.assertTrue;
6167

@@ -71,13 +77,13 @@
7177
class ItWlsDomainOnPVSample {
7278

7379
private static final String domainOnPvSampleScript = "../operator/integration-tests/domain-on-pv/run-test.sh";
74-
private static final String DOMAIN_CREATION_IMAGE_NAME = "wdt-domain-image";
7580
private static final String DOMAIN_CREATION_IMAGE_WLS_TAG = "WLS-v1";
7681
private static String traefikNamespace = null;
7782
private static Map<String, String> envMap = null;
7883
private static LoggingFacade logger = null;
7984

8085
private boolean previousTestSuccessful = true;
86+
private static String DOMAIN_CREATION_IMAGE_NAME = "wdt-domain-image";
8187

8288
/**
8389
* Create namespaces and set environment variables for the test.
@@ -122,7 +128,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
122128
envMap.put("BASE_IMAGE_TAG", WEBLOGIC_IMAGE_TAG);
123129
envMap.put("IMAGE_PULL_SECRET_NAME", BASE_IMAGES_REPO_SECRET_NAME);
124130
envMap.put("DOMAIN_IMAGE_PULL_SECRET_NAME", TEST_IMAGES_REPO_SECRET_NAME);
125-
envMap.put("K8S_NODEPORT_HOST", K8S_NODEPORT_HOST);
131+
envMap.put("WLSIMG_BUILDER_DEFAULT", WLSIMG_BUILDER_DEFAULT);
132+
envMap.put("WLSIMG_BUILDER", WLSIMG_BUILDER);
126133
envMap.put("OKD", "" + OKD);
127134
envMap.put("KIND_CLUSTER", "" + KIND_CLUSTER);
128135
envMap.put("OCNE", "" + OCNE);
@@ -144,6 +151,18 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
144151
if (WDT_DOWNLOAD_URL != null) {
145152
envMap.put("WDT_INSTALLER_URL", WDT_DOWNLOAD_URL);
146153
}
154+
155+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
156+
DOMAIN_CREATION_IMAGE_NAME = "localhost/wdt-domain-image";
157+
envMap.put("OPER_IMAGE_NAME", "localhost/weblogic-kubernetes-operator");
158+
envMap.put("DOMAIN_CREATION_IMAGE_NAME", DOMAIN_CREATION_IMAGE_NAME);
159+
envMap.put("K8S_NODEPORT_HOST", assertDoesNotThrow(() -> InetAddress.getLocalHost().getHostAddress()));
160+
envMap.put("TRAEFIK_INGRESS_HTTP_HOSTPORT", "" + TRAEFIK_INGRESS_HTTP_HOSTPORT);
161+
envMap.put("TRAEFIK_NAMESPACE", TRAEFIK_NAMESPACE);
162+
} else {
163+
envMap.put("TRAEFIK_NAMESPACE", traefikNamespace);
164+
envMap.put("K8S_NODEPORT_HOST", K8S_NODEPORT_HOST);
165+
}
147166
logger.info("Environment variables to the script {0}", envMap);
148167

149168
logger.info("Setting up image registry secrets");
@@ -176,7 +195,12 @@ public void testInstallOperator() {
176195
@Test
177196
@Order(2)
178197
public void testInstallTraefik() {
179-
execTestScriptAndAssertSuccess("-traefik", "Failed to run -traefik");
198+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
199+
logger.info("skip installing Traefik in KIND and podman environment");
200+
logger.info("Traefik is already installed in InitialTask in namespace %s", TRAEFIK_NAMESPACE);
201+
} else {
202+
execTestScriptAndAssertSuccess("-traefik", "Failed to run -traefik");
203+
}
180204
}
181205

182206
/**

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

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
package oracle.weblogic.kubernetes;
55

6+
import java.net.InetAddress;
67
import java.util.HashMap;
78
import java.util.List;
89
import java.util.Map;
@@ -33,12 +34,16 @@
3334
import static oracle.weblogic.kubernetes.TestConstants.OKD;
3435
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
3536
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
37+
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
3638
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_NAME;
3739
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_REGISTRY;
3840
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_TAG;
41+
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_NAMESPACE;
3942
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_RELEASE_NAME;
4043
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
4144
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
45+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
46+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER_DEFAULT;
4247
import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_DOWNLOAD_URL;
4348
import static oracle.weblogic.kubernetes.actions.ActionConstants.WIT_DOWNLOAD_URL;
4449
import static oracle.weblogic.kubernetes.actions.ActionConstants.WIT_JAVA_HOME;
@@ -49,6 +54,7 @@
4954
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
5055
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
5156
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
57+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
5258
import static org.junit.jupiter.api.Assertions.assertNotNull;
5359
import static org.junit.jupiter.api.Assertions.assertTrue;
5460

@@ -64,14 +70,14 @@
6470
class ItWlsMiiLegacySample {
6571

6672
private static final String miiSampleScript = "../operator/integration-tests/model-in-image/run-test.sh";
67-
private static final String DOMAIN_CREATION_IMAGE_NAME = "wdt-domain-image";
6873
private static final String DOMAIN_CREATION_IMAGE_WLS_TAG = "WLS-LEGACY-v1";
6974
private static final String MODEL_IMAGE_WLS_TAG = "WLS-LEGACY-v2";
7075
private static String traefikNamespace = null;
7176
private static Map<String, String> envMap = null;
7277
private static LoggingFacade logger = null;
7378

7479
private boolean previousTestSuccessful = true;
80+
private static String DOMAIN_CREATION_IMAGE_NAME = "wdt-domain-image";
7581

7682
/**
7783
* Create namespaces and set environment variables for the test.
@@ -117,7 +123,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
117123
envMap.put("BASE_IMAGE_TAG", WEBLOGIC_IMAGE_TAG);
118124
envMap.put("IMAGE_PULL_SECRET_NAME", BASE_IMAGES_REPO_SECRET_NAME);
119125
envMap.put("DOMAIN_IMAGE_PULL_SECRET_NAME", TEST_IMAGES_REPO_SECRET_NAME);
120-
envMap.put("K8S_NODEPORT_HOST", K8S_NODEPORT_HOST);
126+
envMap.put("WLSIMG_BUILDER_DEFAULT", WLSIMG_BUILDER_DEFAULT);
127+
envMap.put("WLSIMG_BUILDER", WLSIMG_BUILDER);
121128
envMap.put("OKD", "" + OKD);
122129
envMap.put("KIND_CLUSTER", "" + KIND_CLUSTER);
123130

@@ -133,6 +140,19 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
133140
if (WDT_DOWNLOAD_URL != null) {
134141
envMap.put("WDT_INSTALLER_URL", WDT_DOWNLOAD_URL);
135142
}
143+
144+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
145+
DOMAIN_CREATION_IMAGE_NAME = "localhost/wdt-domain-image";
146+
envMap.put("OPER_IMAGE_NAME", "localhost/weblogic-kubernetes-operator");
147+
envMap.put("MODEL_IMAGE_NAME", DOMAIN_CREATION_IMAGE_NAME);
148+
envMap.put("K8S_NODEPORT_HOST", assertDoesNotThrow(() -> InetAddress.getLocalHost().getHostAddress()));
149+
envMap.put("TRAEFIK_INGRESS_HTTP_HOSTPORT", "" + TRAEFIK_INGRESS_HTTP_HOSTPORT);
150+
envMap.put("TRAEFIK_NAMESPACE", TRAEFIK_NAMESPACE);
151+
} else {
152+
envMap.put("TRAEFIK_NAMESPACE", traefikNamespace);
153+
envMap.put("K8S_NODEPORT_HOST", K8S_NODEPORT_HOST);
154+
}
155+
136156
logger.info("Environment variables to the script {0}", envMap);
137157

138158
logger.info("Setting up image registry secrets");
@@ -163,7 +183,13 @@ public void testInstallOperator() {
163183
@Test
164184
@Order(2)
165185
public void testInstallTraefik() {
166-
execTestScriptAndAssertSuccess("-traefik", "Failed to run -traefik");
186+
187+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
188+
logger.info("skip installing Traefik in KIND and podman environment");
189+
logger.info("Traefik is already installed in InitialTask in namespace %s", TRAEFIK_NAMESPACE);
190+
} else {
191+
execTestScriptAndAssertSuccess("-traefik", "Failed to run -traefik");
192+
}
167193
}
168194

169195
/**

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

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
package oracle.weblogic.kubernetes;
55

6+
import java.net.InetAddress;
67
import java.util.HashMap;
78
import java.util.List;
89
import java.util.Map;
@@ -33,12 +34,16 @@
3334
import static oracle.weblogic.kubernetes.TestConstants.OKD;
3435
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
3536
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
37+
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
3638
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_NAME;
3739
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_REGISTRY;
3840
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_TAG;
41+
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_NAMESPACE;
3942
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_RELEASE_NAME;
4043
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
4144
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
45+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
46+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER_DEFAULT;
4247
import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_DOWNLOAD_URL;
4348
import static oracle.weblogic.kubernetes.actions.ActionConstants.WIT_DOWNLOAD_URL;
4449
import static oracle.weblogic.kubernetes.actions.ActionConstants.WIT_JAVA_HOME;
@@ -49,6 +54,7 @@
4954
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
5055
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
5156
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
57+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
5258
import static org.junit.jupiter.api.Assertions.assertNotNull;
5359
import static org.junit.jupiter.api.Assertions.assertTrue;
5460

@@ -64,14 +70,14 @@
6470
class ItWlsMiiSample {
6571

6672
private static final String miiSampleScript = "../operator/integration-tests/model-in-image/run-test.sh";
67-
private static final String DOMAIN_CREATION_IMAGE_NAME = "wdt-domain-image";
6873
private static final String DOMAIN_CREATION_IMAGE_WLS_TAG = "WLS-v1";
6974
private static final String MODEL_IMAGE_WLS_TAG = "WLS-v2";
7075
private static String traefikNamespace = null;
7176
private static Map<String, String> envMap = null;
7277
private static LoggingFacade logger = null;
7378

7479
private boolean previousTestSuccessful = true;
80+
private static String DOMAIN_CREATION_IMAGE_NAME = "wdt-domain-image";
7581

7682
/**
7783
* Create namespaces and set environment variables for the test.
@@ -117,7 +123,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
117123
envMap.put("BASE_IMAGE_TAG", WEBLOGIC_IMAGE_TAG);
118124
envMap.put("IMAGE_PULL_SECRET_NAME", BASE_IMAGES_REPO_SECRET_NAME);
119125
envMap.put("DOMAIN_IMAGE_PULL_SECRET_NAME", TEST_IMAGES_REPO_SECRET_NAME);
120-
envMap.put("K8S_NODEPORT_HOST", K8S_NODEPORT_HOST);
126+
envMap.put("WLSIMG_BUILDER_DEFAULT", WLSIMG_BUILDER_DEFAULT);
127+
envMap.put("WLSIMG_BUILDER", WLSIMG_BUILDER);
121128
envMap.put("OKD", "" + OKD);
122129
envMap.put("KIND_CLUSTER", "" + KIND_CLUSTER);
123130

@@ -133,6 +140,19 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
133140
if (WDT_DOWNLOAD_URL != null) {
134141
envMap.put("WDT_INSTALLER_URL", WDT_DOWNLOAD_URL);
135142
}
143+
144+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
145+
DOMAIN_CREATION_IMAGE_NAME = "localhost/wdt-domain-image";
146+
envMap.put("OPER_IMAGE_NAME", "localhost/weblogic-kubernetes-operator");
147+
envMap.put("MODEL_IMAGE_NAME", DOMAIN_CREATION_IMAGE_NAME);
148+
envMap.put("K8S_NODEPORT_HOST", assertDoesNotThrow(() -> InetAddress.getLocalHost().getHostAddress()));
149+
envMap.put("TRAEFIK_INGRESS_HTTP_HOSTPORT", "" + TRAEFIK_INGRESS_HTTP_HOSTPORT);
150+
envMap.put("TRAEFIK_NAMESPACE", TRAEFIK_NAMESPACE);
151+
} else {
152+
envMap.put("TRAEFIK_NAMESPACE", traefikNamespace);
153+
envMap.put("K8S_NODEPORT_HOST", K8S_NODEPORT_HOST);
154+
}
155+
136156
logger.info("Environment variables to the script {0}", envMap);
137157

138158
logger.info("Setting up image registry secrets");
@@ -163,7 +183,12 @@ public void testInstallOperator() {
163183
@Test
164184
@Order(2)
165185
public void testInstallTraefik() {
166-
execTestScriptAndAssertSuccess("-traefik", "Failed to run -traefik");
186+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
187+
logger.info("skip installing Traefik in KIND and podman environment");
188+
logger.info("Traefik is already installed in InitialTask in namespace %s", TRAEFIK_NAMESPACE);
189+
} else {
190+
execTestScriptAndAssertSuccess("-traefik", "Failed to run -traefik");
191+
}
167192
}
168193

169194
/**

‎operator/integration-tests/domain-on-pv/test-env.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
#
@@ -62,3 +62,7 @@ export OCNE=${OCNE:-false}
6262

6363
# default Kubernetes CLI
6464
export KUBERNETES_CLI=${KUBERNETES_CLI:-kubectl}
65+
66+
# default WLSIMG_BUILDER
67+
export WLSIMG_BUILDER=${WLSIMG_BUILDER:-docker}
68+
export WLSIMG_BUILDER_DEFAULT=${WLSIMG_BUILDER_DEFAULT:-docker}

‎operator/integration-tests/domain-on-pv/util-misc.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
timestamp() {
@@ -105,7 +105,9 @@ testapp() {
105105
local command="${KUBERNETES_CLI:-kubectl} exec -n $ns $admin_service_name -- bash -c \"curl -s -S $(curl_timeout_parms) http://$cluster_service_name:8001/myapp_war/index.jsp\""
106106

107107
elif [ "$1" = "traefik" ]; then
108-
if [ -z "$traefik_nodeport" ]; then
108+
if [ "$KIND_CLUSTER" = "true" ] && [ "$WLSIMG_BUILDER" != "$WLSIMG_BUILDER_DEFAULT" ]; then
109+
traefik_nodeport=${TRAEFIK_INGRESS_HTTP_HOSTPORT:-2080}
110+
elif [ -z "$traefik_nodeport" ]; then
109111
echo "@@ Info: Obtaining traefik nodeport by calling:"
110112
cat<<EOF
111113
${KUBERNETES_CLI:-kubectl} get svc $TRAEFIK_NAME --namespace $TRAEFIK_NAMESPACE -o=jsonpath='{.spec.ports[?(@.name=="web")].nodePort}'

‎operator/integration-tests/model-in-image/run-test.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,6 @@ if [ "$DO_INITIAL_MAIN" = "true" ]; then
422422
diefast # (cheat to speedup a subsequent roll/shutdown)
423423
if [ "$OKD" = "true" ]; then
424424
testapp OKD cluster-1 "Hello World!"
425-
elif [ "$KIND_CLUSTER" = "true" ]; then
426-
testapp internal cluster-1 v1 "Hello World!"
427-
testapp traefik cluster-1 v1 "Hello World!"
428425
else
429426
testapp internal cluster-1 "Hello World!"
430427
testapp traefik cluster-1 "Hello World!"

‎operator/integration-tests/model-in-image/test-env.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1+
# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
#
@@ -60,3 +60,7 @@ export OKE_CLUSTER=${OKE_CLUSTER:-false}
6060

6161
# default Kubernetes CLI
6262
export KUBERNETES_CLI=${KUBERNETES_CLI:-kubectl}
63+
64+
# default WLSIMG_BUILDER
65+
export WLSIMG_BUILDER=${WLSIMG_BUILDER:-docker}
66+
export WLSIMG_BUILDER_DEFAULT=${WLSIMG_BUILDER_DEFAULT:-docker}

0 commit comments

Comments
 (0)