Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ac94ef1

Browse files
rjeberhardrjeberhard
committedDec 10, 2022
Merge remote-tracking branch 'origin/main' into release/4.0
2 parents e96a0e6 + fbfe384 commit ac94ef1

File tree

23 files changed

+474
-210
lines changed

23 files changed

+474
-210
lines changed
 

‎documentation/4.0/content/managing-domains/accessing-the-domain/istio/istio.md

Lines changed: 58 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ spec:
175175
istio: ingressgateway
176176
servers:
177177
- hosts:
178-
- '*'
178+
- 'yourdomain.dns.com'
179179
port:
180180
name: http
181181
number: 80
@@ -190,7 +190,7 @@ spec:
190190
gateways:
191191
- domain1-gateway
192192
hosts:
193-
- '*'
193+
- 'yourdomain.dns.com'
194194
http:
195195
- match:
196196
- uri:
@@ -416,13 +416,13 @@ See Istio [Destination Rule](https://istio.io/latest/docs/reference/config/netwo
416416

417417
Ingress gateway provides similar functions to `Kubernetes Ingress` but with more advanced functionality.
418418

419-
For example, to configure an Ingress gateway for SSL termination at the gateway:
419+
I. For example, to configure an Ingress gateway for SSL termination at the gateway:
420420

421421
1. Create a TLS certificate and secret.
422422

423423
```text
424424
$ openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /tmp/tls1.key -out /tmp/tls1.crt -subj "/CN=secure-domain.org"
425-
$ kubectl -n weblogic-domain1 create secret tls domain1-tls-cert --key /tmp/tls1.key --cert /tmp/tls1.crt
425+
$ kubectl -n istio-system create secret tls domain1-tls-cert --key /tmp/tls1.key --cert /tmp/tls1.crt
426426
```
427427

428428
2. Create the Ingress gateway.
@@ -453,8 +453,36 @@ spec:
453453
hosts:
454454
- 'regular-domain.org'
455455
```
456+
457+
If you are accessing the WebLogic Console through a secure gateway with SSL termination at the gateway level, enable
458+
`WeblogicPluginEnabled` in the WebLogic domain and add the appropriate request headers. For example,
459+
460+
If you are using WDT, add the `resources` section in the model YAML file.
461+
462+
```text
463+
resources:
464+
WebAppContainer:
465+
WeblogicPluginEnabled: true
466+
```
467+
468+
If you are using WLST, set the `WeblogicPluginEnabled` for each server and cluster
469+
470+
```text
471+
set('WeblogicPluginEnabled',true)
472+
```
456473

457-
For example, to configure an Ingress gateway for SSL passthrough:
474+
Set the request headers in the virtual service: (Use `kubectl explain virtualservice.spec.http.route.headers` for help)
475+
476+
```text
477+
headers:
478+
request:
479+
remove: ['WL-Proxy-Client-IP', 'WL-Proxy-SSL']
480+
set:
481+
X-Forwarded-Proto: https
482+
WL-Proxy-SSL: 'true'
483+
```
484+
485+
II. For example, to configure an Ingress gateway for SSL passthrough:
458486

459487

460488
```text
@@ -483,4 +511,29 @@ spec:
483511
- 'regular-domain.org'
484512
```
485513

514+
The virtual service will then configure to match the `tls` rule.
515+
516+
```text
517+
apiVersion: networking.istio.io/v1alpha3
518+
kind: VirtualService
519+
metadata:
520+
name: sample-domain1-virtualservice
521+
namespace: sample-domain1-ns
522+
spec:
523+
gateways:
524+
- sample-domain1-gateway
525+
hosts:
526+
- secure-domain.org
527+
tls:
528+
- match:
529+
- port: 443
530+
sniHosts:
531+
- secure-domain.org
532+
route:
533+
- destination:
534+
host: sample-domain1-admin-server
535+
port:
536+
number: 9002
537+
```
538+
486539
See Istio [Ingress](https://istio.io/latest/docs/tasks/traffic-management/ingress).

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
3333
import oracle.weblogic.kubernetes.annotations.Namespaces;
3434
import oracle.weblogic.kubernetes.logging.LoggingFacade;
35+
import org.awaitility.core.ConditionFactory;
3536
import org.junit.jupiter.api.BeforeAll;
3637
import org.junit.jupiter.api.DisplayName;
3738
import org.junit.jupiter.api.MethodOrderer;
@@ -67,6 +68,7 @@
6768
import static oracle.weblogic.kubernetes.utils.ClusterUtils.stopCluster;
6869
import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.verifyPodsNotRolled;
6970
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
71+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createCustomConditionFactory;
7072
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
7173
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
7274
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
@@ -254,7 +256,8 @@ void testAddReplaceClusterResource() {
254256

255257
//verify the introspector pod is created and runs
256258
String introspectPodNameBase2 = getIntrospectJobName(domainUid);
257-
checkPodExists(introspectPodNameBase2, domainUid, domainNamespace);
259+
ConditionFactory customConditionFactory = createCustomConditionFactory(0, 1, 5);
260+
checkPodExists(customConditionFactory, introspectPodNameBase2, domainUid, domainNamespace);
258261
checkPodDoesNotExist(introspectPodNameBase2, domainUid, domainNamespace);
259262

260263
// check managed server pods from cluster-1 are shutdown
@@ -363,7 +366,8 @@ void testDomainStatusMatchesClusterResourceStatus() {
363366

364367
//verify the introspector pod is created and runs
365368
String introspectPodNameBase2 = getIntrospectJobName(domainUid);
366-
checkPodExists(introspectPodNameBase2, domainUid, domainNamespace);
369+
ConditionFactory customConditionFactory = createCustomConditionFactory(0, 1, 5);
370+
checkPodExists(customConditionFactory, introspectPodNameBase2, domainUid, domainNamespace);
367371
checkPodDoesNotExist(introspectPodNameBase2, domainUid, domainNamespace);
368372

369373
// check managed server pods from cluster-1 are shutdown

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,11 +404,15 @@ void testRetryOccursAndErrorFromIntrospectorLoggedInOperator() throws Exception
404404
testUntil(() -> checkPodLogContainsRegex(createDomainFailedMsgRegex, operatorPodName, opNamespace),
405405
logger, "{0} is found in Operator log", createDomainFailedMsgRegex);
406406

407-
// verify that SEVERE and createDomainFailedMsgRegex message found in Operator log
407+
// verify that SEVERE and createDomainFailedMsgRegex message found in introspector log
408408
testUntil(() -> checkInUncompletedIntroPodLogContainsRegex(createDomainFailedMsgRegex,
409409
domainUid, domainNamespace),
410410
logger, "{0} is found in introspector log", createDomainFailedMsgRegex);
411411

412+
// verify that SEVERE and createDomainFailedMsgRegex message found in domain status
413+
testUntil(() -> findStringInDomainStatusMessage(domainNamespace, domainUid, createDomainFailedMsgRegex, "true"),
414+
logger, "{0} is found in domain status message", createDomainFailedMsgRegex);
415+
412416
Callable<Boolean> configMapExist = assertDoesNotThrow(() -> configMapExist(domainNamespace, badModelFileCm));
413417

414418
if (configMapExist.call().booleanValue()) {

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,19 @@ private static ConditionFactory createStandardRetryPolicyWithAtMost(long minutes
129129

130130
private static final String TMP_FILE_NAME = "temp-download-file.out";
131131

132+
/**
133+
* Create a condition factory with custom values for pollDelay, pollInterval and atMost time.
134+
*
135+
* @param polldelay starting delay before checking for the condition in seconds
136+
* @param pollInterval interval time between checking for the condition in seconds
137+
* @param atMostMinutes how long should it wait for the condition becomes true in minutes
138+
* @return ConditionFactory custom condition factory
139+
*/
140+
public static ConditionFactory createCustomConditionFactory(int polldelay, int pollInterval, int atMostMinutes) {
141+
return with().pollDelay(polldelay, SECONDS)
142+
.and().with().pollInterval(pollInterval, SECONDS)
143+
.atMost(atMostMinutes, MINUTES).await();
144+
}
132145

133146
/**
134147
* Test assertion using standard retry policy over time until it passes or the timeout expires.

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,14 +1212,25 @@ public static DomainResource getAndValidateInitialDomain(String domainNamespace,
12121212
* @return true if regex found, false otherwise.
12131213
*/
12141214
@Nonnull
1215-
public static boolean findStringInDomainStatusMessage(String domainNamespace, String domainUid, String regex) {
1215+
public static boolean findStringInDomainStatusMessage(String domainNamespace,
1216+
String domainUid,
1217+
String regex,
1218+
String... multupleMessage) {
12161219
// get the domain status message
12171220
StringBuffer getDomainInfoCmd = new StringBuffer(KUBERNETES_CLI + " get domain/");
12181221
getDomainInfoCmd
12191222
.append(domainUid)
12201223
.append(" -n ")
1221-
.append(domainNamespace)
1222-
.append(" -o jsonpath='{.status.message}' --ignore-not-found");
1224+
.append(domainNamespace);
1225+
1226+
if (multupleMessage.length == 0) {
1227+
// get single field of domain message
1228+
getDomainInfoCmd.append(" -o jsonpath='{.status.message}' --ignore-not-found");
1229+
} else {
1230+
// use [,] to get side by side multiple fields of the domain status message
1231+
getDomainInfoCmd.append(" -o jsonpath=\"{.status.conditions[*]['status', 'message']}\" --ignore-not-found");
1232+
}
1233+
12231234
getLogger().info("Command to get domain status message: " + getDomainInfoCmd);
12241235

12251236
CommandParams params = new CommandParams().defaults();

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,27 @@ public static void checkPodExists(String podName, String domainUid, String domai
9494
domainNamespace);
9595
}
9696

97+
/**
98+
* Check pod exists in the specified namespace.
99+
*
100+
* @param conditionFactory Configuration for Awaitility condition factory
101+
* @param podName pod name to check
102+
* @param domainUid the label the pod is decorated with
103+
* @param domainNamespace the domain namespace in which the domain exists
104+
*/
105+
public static void checkPodExists(ConditionFactory conditionFactory, String podName,
106+
String domainUid, String domainNamespace) {
107+
LoggingFacade logger = getLogger();
108+
testUntil(conditionFactory,
109+
assertDoesNotThrow(() -> podExists(podName, domainUid, domainNamespace),
110+
String.format("podExists failed with ApiException for pod %s in namespace %s",
111+
podName, domainNamespace)),
112+
logger,
113+
"pod {0} to be created in namespace {1}",
114+
podName,
115+
domainNamespace);
116+
}
117+
97118
/**
98119
* Check pod is ready.
99120
*

‎kubernetes/crd/cluster-crd.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
weblogic.sha256: 46ef88005b68d9fb13a122b63fece506c555770209221581cb056c15f1ac7e6a
8+
weblogic.sha256: 9f051b9b7805fc9100cf6490873e80b91671c7165960bfbcd6e8007ae171937f
99
name: clusters.weblogic.oracle
1010
spec:
1111
group: weblogic.oracle
@@ -526,8 +526,6 @@ spec:
526526
type: string
527527
fieldsType:
528528
type: string
529-
clusterName:
530-
type: string
531529
creationTimestamp:
532530
format: date-time
533531
type: string

‎kubernetes/crd/domain-crd.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
weblogic.sha256: 3a81ece5d88c85957a5d5e4a1b6c068cdca4355afd80a5a6598cbfade313871f
8+
weblogic.sha256: 50af6b0cfbe5da871bbeae4bb4fd91c6da38931a01817fa475801e63dbbbdcd5
99
name: domains.weblogic.oracle
1010
spec:
1111
group: weblogic.oracle
@@ -1024,8 +1024,6 @@ spec:
10241024
type: string
10251025
fieldsType:
10261026
type: string
1027-
clusterName:
1028-
type: string
10291027
creationTimestamp:
10301028
format: date-time
10311029
type: string
@@ -4014,8 +4012,6 @@ spec:
40144012
type: string
40154013
fieldsType:
40164014
type: string
4017-
clusterName:
4018-
type: string
40194015
creationTimestamp:
40204016
format: date-time
40214017
type: string
@@ -6842,8 +6838,6 @@ spec:
68426838
type: string
68436839
fieldsType:
68446840
type: string
6845-
clusterName:
6846-
type: string
68476841
creationTimestamp:
68486842
format: date-time
68496843
type: string

‎kubernetes/samples/scripts/common/domain-template.yaml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# This is an example of how to define a Domain resource.
55
#
6-
apiVersion: "weblogic.oracle/v8"
6+
apiVersion: "weblogic.oracle/v9"
77
kind: Domain
88
metadata:
99
name: %DOMAIN_UID%
@@ -83,12 +83,26 @@ spec:
8383
# Uncomment to export the T3Channel as a service
8484
%EXPOSE_T3_CHANNEL_PREFIX% - channelName: T3Channel
8585

86-
# clusters is used to configure the desired behavior for starting member servers of a cluster.
87-
# If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
86+
# References to Cluster resources that describe the lifecycle options for all
87+
# the Managed Server members of a WebLogic cluster, including Java
88+
# options, environment variables, additional Pod content, and the ability to
89+
# explicitly start, stop, or restart cluster members. The Cluster resource
90+
# must describe a cluster that already exists in the WebLogic domain
91+
# configuration.
8892
clusters:
89-
- clusterName: %CLUSTER_NAME%
90-
replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
93+
- name: %DOMAIN_UID%-%CLUSTER_NAME%
94+
9195
# The number of managed servers to start for unlisted clusters
9296
# replicas: 1
9397

98+
---
99+
# This is an example of how to define a Cluster resource.
100+
apiVersion: weblogic.oracle/v1
101+
kind: Cluster
102+
metadata:
103+
name: %DOMAIN_UID%-%CLUSTER_NAME%
104+
namespace: %NAMESPACE%
105+
spec:
106+
clusterName: %CLUSTER_NAME%
107+
replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
94108

‎kubernetes/samples/scripts/common/jrf-domain-template.yaml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# This is an example of how to define a Domain resource.
55
#
6-
apiVersion: "weblogic.oracle/v8"
6+
apiVersion: "weblogic.oracle/v9"
77
kind: Domain
88
metadata:
99
name: %DOMAIN_UID%
@@ -49,11 +49,11 @@ spec:
4949
# data storage directories are determined from the WebLogic domain home configuration.
5050
dataHome: "%DATA_HOME%"
5151

52-
# serverStartPolicy legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
52+
# serverStartPolicy legal values are "Never, "IfNeeded", or "AdminOnly"
5353
# This determines which WebLogic Servers the Operator will start up when it discovers this Domain
54-
# - "NEVER" will not start any server in the domain
55-
# - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
56-
# - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
54+
# - "Never" will not start any server in the domain
55+
# - "AdminOnly" will start up only the administration server (no managed servers will be started)
56+
# - "IfNeeded" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
5757
serverStartPolicy: %SERVER_START_POLICY%
5858

5959
serverPod:
@@ -87,12 +87,26 @@ spec:
8787
- name: USER_MEM_ARGS
8888
value: "-Djava.security.egd=file:/dev/./urandom -Xms512m -Xmx1024m "
8989

90-
# clusters is used to configure the desired behavior for starting member servers of a cluster.
91-
# If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
90+
# References to Cluster resources that describe the lifecycle options for all
91+
# the Managed Server members of a WebLogic cluster, including Java
92+
# options, environment variables, additional Pod content, and the ability to
93+
# explicitly start, stop, or restart cluster members. The Cluster resource
94+
# must describe a cluster that already exists in the WebLogic domain
95+
# configuration.
9296
clusters:
93-
- clusterName: %CLUSTER_NAME%
94-
replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
97+
- name: %DOMAIN_UID%-%CLUSTER_NAME%
98+
9599
# The number of managed servers to start for unlisted clusters
96100
# replicas: 1
97101

102+
---
103+
# This is an example of how to define a Cluster resource.
104+
apiVersion: weblogic.oracle/v1
105+
kind: Cluster
106+
metadata:
107+
name: %DOMAIN_UID%-%CLUSTER_NAME%
108+
namespace: %NAMESPACE%
109+
spec:
110+
clusterName: %CLUSTER_NAME%
111+
replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
98112

‎kubernetes/samples/scripts/common/utility.sh

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,24 +289,27 @@ getKubernetesClusterIP() {
289289
#
290290
buildServerPodResources() {
291291

292+
level1_indent=" "
293+
level2_indent="${level1_indent} "
294+
292295
if [ -n "${serverPodMemoryRequest}" ]; then
293-
local memoryRequest=" memory\: \"${serverPodMemoryRequest}\"\n"
296+
local memoryRequest="${level2_indent}memory\: \"${serverPodMemoryRequest}\"\n"
294297
fi
295298
if [ -n "${serverPodCpuRequest}" ]; then
296-
local cpuRequest=" cpu\: \"${serverPodCpuRequest}\"\n"
299+
local cpuRequest="${level2_indent}cpu\: \"${serverPodCpuRequest}\"\n"
297300
fi
298301
if [ -n "${memoryRequest}" ] || [ -n "${cpuRequest}" ]; then
299-
local requests=" requests\: \n$memoryRequest $cpuRequest"
302+
local requests="${level1_indent}requests\: \n${memoryRequest}${cpuRequest}"
300303
fi
301304

302305
if [ -n "${serverPodMemoryLimit}" ]; then
303-
local memoryLimit=" memory\: \"${serverPodMemoryLimit}\"\n"
306+
local memoryLimit="${level2_indent}memory\: \"${serverPodMemoryLimit}\"\n"
304307
fi
305308
if [ -n "${serverPodCpuLimit}" ]; then
306-
local cpuLimit=" cpu\: \"${serverPodCpuLimit}\"\n"
309+
local cpuLimit="${level2_indent}cpu\: \"${serverPodCpuLimit}\"\n"
307310
fi
308311
if [ -n "${memoryLimit}" ] || [ -n "${cpuLimit}" ]; then
309-
local limits=" limits\: \n$memoryLimit $cpuLimit"
312+
local limits="${level1_indent}limits\: \n${memoryLimit}${cpuLimit}"
310313
fi
311314

312315
if [ -n "${requests}" ] || [ -n "${limits}" ]; then
@@ -654,11 +657,13 @@ createFiles() {
654657

655658
#
656659
# Function to markup the wdt model file
660+
# $1 - Name of wdt model file. Optional. Defaults to wdt_k8s_model_template.yaml
657661
#
658662
updateModelFile() {
659663
# Update the wdt model file with kubernetes section
660664
modelFile="${domainOutputDir}/tmp/wdt_model.yaml"
661-
cat ${scriptDir}/wdt_k8s_model_template.yaml >> ${modelFile}
665+
model_template_file=${1:-wdt_k8s_model_template.yaml}
666+
cat ${scriptDir}/${model_template_file} >> ${modelFile}
662667

663668
sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${modelFile}
664669
sed -i -e "s:%NAMESPACE%:$namespace:g" ${modelFile}
@@ -688,6 +693,7 @@ updateModelFile() {
688693
sed -i -e "s:%EXPOSE_ADMIN_PORT_PREFIX%:${exposeAdminNodePortPrefix}:g" ${modelFile}
689694
sed -i -e "s:%ADMIN_NODE_PORT%:${adminNodePort}:g" ${modelFile}
690695
sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${modelFile}
696+
sed -i -e "s:%CLUSTER_NAME2%:${clusterName2}:g" ${modelFile}
691697
sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${modelFile}
692698
# MII settings are used for model-in-image integration testing
693699
sed -i -e "s:%MII_PREFIX%:${miiPrefix}:g" ${modelFile}

‎kubernetes/samples/scripts/common/validate.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,16 +262,16 @@ validateServerStartPolicy() {
262262
validateInputParamsSpecified serverStartPolicy
263263
if [ ! -z "${serverStartPolicy}" ]; then
264264
case ${serverStartPolicy} in
265-
"NEVER")
265+
"Never")
266266
;;
267-
"ALWAYS")
267+
"Always")
268268
;;
269-
"IF_NEEDED")
269+
"IfNeeded")
270270
;;
271-
"ADMIN_ONLY")
271+
"AdminOnly")
272272
;;
273273
*)
274-
validationError "Invalid value for serverStartPolicy: ${serverStartPolicy}. Valid values are 'NEVER', 'ALWAYS', 'IF_NEEDED', and 'ADMIN_ONLY'."
274+
validationError "Invalid value for serverStartPolicy: ${serverStartPolicy}. Valid values are 'Never', 'Always', 'IfNeeded', and 'AdminOnly'."
275275
;;
276276
esac
277277
fi

‎kubernetes/samples/scripts/common/wdt-and-wit-utility.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ run_wdt() {
221221
-domain_home $domain_home_dir
222222
-model_file $model_final
223223
-variable_file $inputs_final
224+
-target wko4
224225
"
225226
echo @@ "Info: About to run the following WDT command:"
226227
echo "${cmd}"

‎kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-in-image/create-domain-inputs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ domainUID: domain1
2020
domainHome: /u01/oracle/user_projects/domains/domain1
2121

2222
# Determines which OracleFMWInfrastructure Servers the operator will start up
23-
# Legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
24-
serverStartPolicy: IF_NEEDED
23+
# Legal values are "Never", "IfNeeded", or "AdminOnly"
24+
serverStartPolicy: IfNeeded
2525

2626
# Cluster name
2727
clusterName: cluster-1

‎kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-in-image/create-domain.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ initOutputDir() {
113113

114114
# try to execute image builder to see whether it is available
115115
validateImageBuilderAvailable() {
116-
if ! [ -x "$(command -v ${WLSIMG_BUILDER})" ]; then
117-
validationError "${WLSIMG_BUILDER} is not installed"
116+
if ! [ -x "$(command -v ${WLSIMG_BUILDER:-docker})" ]; then
117+
validationError "${WLSIMG_BUILDER:-docker} is not installed"
118118
fi
119119
}
120120

‎kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-on-pv/create-domain-inputs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ domainUID: domain1
1818
# If not specified, the value is derived from the domainUID as /shared/domains/<domainUID>
1919
domainHome: /shared/domains/domain1
2020

21-
# Determines which WebLogic Servers the operator will start up
22-
# Legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
23-
serverStartPolicy: IF_NEEDED
21+
# Determines which OracleFMWInfrastructure Servers the operator will start up
22+
# Legal values are "Never", "IfNeeded", or "AdminOnly"
23+
serverStartPolicy: IfNeeded
2424

2525
# Cluster name
2626
clusterName: cluster-1

‎kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-on-pv/wdt_k8s_model_template.yaml

Lines changed: 83 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -6,84 +6,98 @@
66
# extractDomainResource script to generate a domain.yaml
77
#
88
kubernetes:
9-
apiVersion: "weblogic.oracle/v8"
10-
kind: Domain
11-
metadata:
12-
name: %DOMAIN_UID%
13-
namespace: "%NAMESPACE%"
14-
labels:
15-
#weblogic.resourceVersion: "domain-v2"
16-
weblogic.domainUID: %DOMAIN_UID%
17-
spec:
18-
# The WebLogic Domain Home
19-
domainHome: %DOMAIN_HOME%
9+
domain:
10+
metadata:
11+
name: %DOMAIN_UID%
12+
namespace: "%NAMESPACE%"
13+
spec:
14+
# The WebLogic Domain Home
15+
domainHome: %DOMAIN_HOME%
2016

21-
# The domain home source type
22-
# Set to PersistentVolume for domain-in-pv, Image for domain-in-image, or FromModel for model-in-image
23-
domainHomeSourceType: %DOMAIN_HOME_SOURCE_TYPE%
17+
# The domain home source type
18+
# Set to PersistentVolume for domain-in-pv, Image for domain-in-image, or FromModel for model-in-image
19+
domainHomeSourceType: %DOMAIN_HOME_SOURCE_TYPE%
2420

25-
# The WebLogic Server Docker image that the Operator uses to start the domain
26-
image: "%WEBLOGIC_IMAGE%"
21+
# The WebLogic Server Docker image that the Operator uses to start the domain
22+
image: "%WEBLOGIC_IMAGE%"
2723

28-
# imagePullPolicy defaults to "Always" if image version is :latest
29-
imagePullPolicy: %WEBLOGIC_IMAGE_PULL_POLICY%
24+
# imagePullPolicy defaults to "Always" if image version is :latest
25+
imagePullPolicy: %WEBLOGIC_IMAGE_PULL_POLICY%
3026

31-
# Identify which Secret contains the credentials for pulling an image
32-
%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
33-
%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX% - name: "%WEBLOGIC_IMAGE_PULL_SECRET_NAME%"
34-
# Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
35-
# how to create that Secret at the end of this file)
36-
webLogicCredentialsSecret:
37-
name: '%WEBLOGIC_CREDENTIALS_SECRET_NAME%'
27+
# Identify which Secret contains the credentials for pulling an image
28+
%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
29+
%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX% - name: "%WEBLOGIC_IMAGE_PULL_SECRET_NAME%"
30+
# Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
31+
# how to create that Secret at the end of this file)
32+
webLogicCredentialsSecret:
33+
name: '%WEBLOGIC_CREDENTIALS_SECRET_NAME%'
3834

39-
# Whether to include the server out file into the pod's stdout, default is true
40-
includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
35+
# Whether to include the server out file into the pod's stdout, default is true
36+
includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
4137

42-
# Whether to enable log home
43-
%LOG_HOME_ON_PV_PREFIX%logHomeEnabled: %LOG_HOME_ENABLED%
38+
# Whether to enable log home
39+
%LOG_HOME_ON_PV_PREFIX%logHomeEnabled: %LOG_HOME_ENABLED%
4440

45-
# Whether to write HTTP access log file to log home
46-
#%LOG_HOME_ON_PV_PREFIX%httpAccessLogInLogHome: %HTTP_ACCESS_LOG_IN_LOG_HOME%
41+
# Whether to write HTTP access log file to log home
42+
#%LOG_HOME_ON_PV_PREFIX%httpAccessLogInLogHome: %HTTP_ACCESS_LOG_IN_LOG_HOME%
4743

48-
# The in-pod location for domain log, server logs, server out, and Node Manager log files
49-
%LOG_HOME_ON_PV_PREFIX%logHome: %LOG_HOME%
50-
# An (optional) in-pod location for data storage of default and custom file stores.
51-
# If not specified or the value is either not set or empty (e.g. dataHome: "") then the
52-
# data storage directories are determined from the WebLogic domain home configuration.
53-
dataHome: "%DATA_HOME%"
44+
# The in-pod location for domain log, server logs, server out, and Node Manager log files
45+
%LOG_HOME_ON_PV_PREFIX%logHome: %LOG_HOME%
46+
# An (optional) in-pod location for data storage of default and custom file stores.
47+
# If not specified or the value is either not set or empty (e.g. dataHome: "") then the
48+
# data storage directories are determined from the WebLogic domain home configuration.
49+
dataHome: "%DATA_HOME%"
5450

55-
replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
51+
replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
5652

57-
# serverStartPolicy legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
58-
# This determines which WebLogic Servers the Operator will start up when it discovers this Domain
59-
# - "NEVER" will not start any server in the domain
60-
# - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
61-
# - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
62-
serverStartPolicy: %SERVER_START_POLICY%
53+
# serverStartPolicy legal values are "Never, "IfNeeded", or "AdminOnly"
54+
# This determines which WebLogic Servers the Operator will start up when it discovers this Domain
55+
# - "Never" will not start any server in the domain
56+
# - "AdminOnly" will start up only the administration server (no managed servers will be started)
57+
# - "IfNeeded" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
58+
serverStartPolicy: %SERVER_START_POLICY%
6359

64-
serverPod:
65-
# an (optional) list of environment variable to be set on the servers
66-
env:
67-
- name: JAVA_OPTIONS
68-
value: "%JAVA_OPTIONS%"
69-
- name: USER_MEM_ARGS
70-
value: "-Djava.security.egd=file:/dev/./urandom "
71-
%OPTIONAL_SERVERPOD_RESOURCES%
72-
%LOG_HOME_ON_PV_PREFIX%volumes:
73-
%LOG_HOME_ON_PV_PREFIX% - name: 'weblogic-domain-storage-volume'
74-
%LOG_HOME_ON_PV_PREFIX% persistentVolumeClaim:
75-
%LOG_HOME_ON_PV_PREFIX% claimName: '%DOMAIN_PVC_NAME%'
76-
%LOG_HOME_ON_PV_PREFIX%volumeMounts:
77-
%LOG_HOME_ON_PV_PREFIX% - name: 'weblogic-domain-storage-volume'
78-
%LOG_HOME_ON_PV_PREFIX% mountPath: %DOMAIN_ROOT_DIR%
79-
80-
# adminServer is used to configure the desired behavior for starting the administration server.
81-
adminServer:
82-
%EXPOSE_ANY_CHANNEL_PREFIX%adminService:
83-
%EXPOSE_ANY_CHANNEL_PREFIX% channels:
84-
# The Admin Server's NodePort
85-
%EXPOSE_ANY_CHANNEL_PREFIX% - channelName: default
86-
%EXPOSE_ADMIN_PORT_PREFIX% nodePort: %ADMIN_NODE_PORT%
87-
# Uncomment to export the T3Channel as a service
88-
%EXPOSE_T3_CHANNEL_PREFIX% - channelName: T3Channel
60+
serverPod:
61+
# an (optional) list of environment variable to be set on the servers
62+
env:
63+
- name: JAVA_OPTIONS
64+
value: "%JAVA_OPTIONS%"
65+
- name: USER_MEM_ARGS
66+
value: "-Djava.security.egd=file:/dev/./urandom "
67+
%OPTIONAL_SERVERPOD_RESOURCES%
68+
%LOG_HOME_ON_PV_PREFIX%volumes:
69+
%LOG_HOME_ON_PV_PREFIX% - name: 'weblogic-domain-storage-volume'
70+
%LOG_HOME_ON_PV_PREFIX% persistentVolumeClaim:
71+
%LOG_HOME_ON_PV_PREFIX% claimName: '%DOMAIN_PVC_NAME%'
72+
%LOG_HOME_ON_PV_PREFIX%volumeMounts:
73+
%LOG_HOME_ON_PV_PREFIX% - name: 'weblogic-domain-storage-volume'
74+
%LOG_HOME_ON_PV_PREFIX% mountPath: %DOMAIN_ROOT_DIR%
8975

76+
# adminServer is used to configure the desired behavior for starting the administration server.
77+
adminServer:
78+
%EXPOSE_ANY_CHANNEL_PREFIX%adminService:
79+
%EXPOSE_ANY_CHANNEL_PREFIX% channels:
80+
# The Admin Server's NodePort
81+
%EXPOSE_ANY_CHANNEL_PREFIX% - channelName: default
82+
%EXPOSE_ADMIN_PORT_PREFIX% nodePort: %ADMIN_NODE_PORT%
83+
# Uncomment to export the T3Channel as a service
84+
%EXPOSE_T3_CHANNEL_PREFIX% - channelName: T3Channel
85+
86+
# References to Cluster resources that describe the lifecycle options for all
87+
# the Managed Server members of a WebLogic cluster, including Java
88+
# options, environment variables, additional Pod content, and the ability to
89+
# explicitly start, stop, or restart cluster members. The Cluster resource
90+
# must describe a cluster that already exists in the WebLogic domain
91+
# configuration.
92+
clusters:
93+
- name: %DOMAIN_UID%-%CLUSTER_NAME%
94+
95+
# clusters is used to configure the desired behavior for starting member servers of a cluster.
96+
# If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
97+
clusters:
98+
- metadata:
99+
name: %DOMAIN_UID%-%CLUSTER_NAME%
100+
namespace: "%NAMESPACE%"
101+
spec:
102+
clusterName: %CLUSTER_NAME%
103+
replicas: %INITIAL_MANAGED_SERVER_REPLICAS%

‎kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ domainUID: domain1
2727
domainHome: /u01/oracle/user_projects/domains/domain1
2828

2929
# Determines which WebLogic Servers the operator will start up
30-
# Legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
31-
serverStartPolicy: IF_NEEDED
30+
# Legal values are "Never", "IfNeeded", or "AdminOnly"
31+
serverStartPolicy: IfNeeded
3232

3333
# Cluster name
3434
clusterName: cluster-1

‎kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ domainUID: domain1
1818
# If not specified, the value is derived from the domainUID as /shared/domains/<domainUID>
1919
domainHome: /shared/domains/domain1
2020

21+
domainHomeSourceType:
22+
2123
# Determines which WebLogic Servers the operator will start up
22-
# Legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
23-
serverStartPolicy: IF_NEEDED
24+
# Legal values are "Never", "IfNeeded", or "AdminOnly"
25+
serverStartPolicy: IfNeeded
2426

2527
# Cluster name
2628
clusterName: cluster-1

‎kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/update-domain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ createDomainConfigmap() {
169169

170170
# Now that we have the model file in the domainoutputdir/tmp,
171171
# we can add the kubernetes section to the model file.
172-
updateModelFile
172+
updateModelFile wdt_k8s_model_template_updated.yaml
173173

174174
# create the configmap and label it properly
175175
local cmName=${domainUID}-update-weblogic-sample-domain-job-cm

‎kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wdt_k8s_model_template.yaml

Lines changed: 81 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -6,89 +6,96 @@
66
# extractDomainResource script to generate a domain.yaml
77
#
88
kubernetes:
9-
apiVersion: "weblogic.oracle/v8"
10-
kind: Domain
11-
metadata:
12-
name: %DOMAIN_UID%
13-
namespace: "%NAMESPACE%"
14-
labels:
15-
#weblogic.resourceVersion: "domain-v2"
16-
weblogic.domainUID: %DOMAIN_UID%
17-
spec:
18-
# The WebLogic Domain Home
19-
domainHome: %DOMAIN_HOME%
9+
domain:
10+
metadata:
11+
name: %DOMAIN_UID%
12+
namespace: "%NAMESPACE%"
13+
spec:
14+
# The WebLogic Domain Home
15+
domainHome: %DOMAIN_HOME%
2016

21-
# The domain home source type
22-
# Set to PersistentVolume for domain-in-pv, Image for domain-in-image, or FromModel for model-in-image
23-
domainHomeSourceType: %DOMAIN_HOME_SOURCE_TYPE%
17+
# The domain home source type
18+
# Set to PersistentVolume for domain-in-pv, Image for domain-in-image, or FromModel for model-in-image
19+
domainHomeSourceType: "%DOMAIN_HOME_SOURCE_TYPE%"
2420

25-
# The WebLogic Server Docker image that the Operator uses to start the domain
26-
image: "%WEBLOGIC_IMAGE%"
21+
# The WebLogic Server Docker image that the Operator uses to start the domain
22+
image: "%WEBLOGIC_IMAGE%"
2723

28-
# imagePullPolicy defaults to "Always" if image version is :latest
29-
imagePullPolicy: %WEBLOGIC_IMAGE_PULL_POLICY%
24+
# imagePullPolicy defaults to "Always" if image version is :latest
25+
imagePullPolicy: %WEBLOGIC_IMAGE_PULL_POLICY%
3026

31-
# Identify which Secret contains the credentials for pulling an image
32-
%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
33-
%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX% - name: "%WEBLOGIC_IMAGE_PULL_SECRET_NAME%"
34-
# Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
35-
# how to create that Secret at the end of this file)
36-
webLogicCredentialsSecret:
37-
name: '%WEBLOGIC_CREDENTIALS_SECRET_NAME%'
27+
# Identify which Secret contains the credentials for pulling an image
28+
%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
29+
%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX% - name: "%WEBLOGIC_IMAGE_PULL_SECRET_NAME%"
30+
# Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
31+
# how to create that Secret at the end of this file)
32+
webLogicCredentialsSecret:
33+
name: '%WEBLOGIC_CREDENTIALS_SECRET_NAME%'
3834

39-
# Whether to include the server out file into the pod's stdout, default is true
40-
includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
35+
# Whether to include the server out file into the pod's stdout, default is true
36+
includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
4137

42-
# Whether to enable log home
43-
%LOG_HOME_ON_PV_PREFIX%logHomeEnabled: %LOG_HOME_ENABLED%
38+
# Whether to enable log home
39+
%LOG_HOME_ON_PV_PREFIX%logHomeEnabled: %LOG_HOME_ENABLED%
4440

45-
# Whether to write HTTP access log file to log home
46-
#%LOG_HOME_ON_PV_PREFIX%httpAccessLogInLogHome: %HTTP_ACCESS_LOG_IN_LOG_HOME%
41+
# Whether to write HTTP access log file to log home
42+
#%LOG_HOME_ON_PV_PREFIX%httpAccessLogInLogHome: %HTTP_ACCESS_LOG_IN_LOG_HOME%
4743

48-
# The in-pod location for domain log, server logs, server out, and Node Manager log files
49-
%LOG_HOME_ON_PV_PREFIX%logHome: %LOG_HOME%
50-
# An (optional) in-pod location for data storage of default and custom file stores.
51-
# If not specified or the value is either not set or empty (e.g. dataHome: "") then the
52-
# data storage directories are determined from the WebLogic domain home configuration.
53-
dataHome: "%DATA_HOME%"
44+
# The in-pod location for domain log, server logs, server out, and Node Manager log files
45+
%LOG_HOME_ON_PV_PREFIX%logHome: %LOG_HOME%
46+
# An (optional) in-pod location for data storage of default and custom file stores.
47+
# If not specified or the value is either not set or empty (e.g. dataHome: "") then the
48+
# data storage directories are determined from the WebLogic domain home configuration.
49+
dataHome: "%DATA_HOME%"
5450

55-
replicas: 2
56-
# serverStartPolicy legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
57-
# This determines which WebLogic Servers the Operator will start up when it discovers this Domain
58-
# - "NEVER" will not start any server in the domain
59-
# - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
60-
# - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
61-
serverStartPolicy: %SERVER_START_POLICY%
51+
replicas: 2
52+
# serverStartPolicy legal values are "Never, "IfNeeded", or "AdminOnly"
53+
# This determines which WebLogic Servers the Operator will start up when it discovers this Domain
54+
# - "Never" will not start any server in the domain
55+
# - "AdminOnly" will start up only the administration server (no managed servers will be started)
56+
# - "IfNeeded" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
57+
serverStartPolicy: %SERVER_START_POLICY%
6258

63-
serverPod:
64-
# an (optional) list of environment variable to be set on the servers
65-
env:
66-
- name: JAVA_OPTIONS
67-
value: "%JAVA_OPTIONS%"
68-
- name: USER_MEM_ARGS
69-
value: "-Djava.security.egd=file:/dev/./urandom "
70-
%OPTIONAL_SERVERPOD_RESOURCES%
71-
%LOG_HOME_ON_PV_PREFIX%volumes:
72-
%LOG_HOME_ON_PV_PREFIX% - name: 'weblogic-domain-storage-volume'
73-
%LOG_HOME_ON_PV_PREFIX% persistentVolumeClaim:
74-
%LOG_HOME_ON_PV_PREFIX% claimName: '%DOMAIN_PVC_NAME%'
75-
%LOG_HOME_ON_PV_PREFIX%volumeMounts:
76-
%LOG_HOME_ON_PV_PREFIX% - name: 'weblogic-domain-storage-volume'
77-
%LOG_HOME_ON_PV_PREFIX% mountPath: %DOMAIN_ROOT_DIR%
78-
79-
# adminServer is used to configure the desired behavior for starting the administration server.
80-
adminServer:
81-
%EXPOSE_ANY_CHANNEL_PREFIX%adminService:
82-
%EXPOSE_ANY_CHANNEL_PREFIX% channels:
83-
# The Admin Server's NodePort
84-
%EXPOSE_ANY_CHANNEL_PREFIX% - channelName: default
85-
%EXPOSE_ADMIN_PORT_PREFIX% nodePort: %ADMIN_NODE_PORT%
86-
# Uncomment to export the T3Channel as a service
87-
%EXPOSE_T3_CHANNEL_PREFIX% - channelName: T3Channel
59+
serverPod:
60+
# an (optional) list of environment variable to be set on the servers
61+
env:
62+
- name: JAVA_OPTIONS
63+
value: "%JAVA_OPTIONS%"
64+
- name: USER_MEM_ARGS
65+
value: "-Djava.security.egd=file:/dev/./urandom "
66+
%OPTIONAL_SERVERPOD_RESOURCES%
67+
%LOG_HOME_ON_PV_PREFIX%volumes:
68+
%LOG_HOME_ON_PV_PREFIX% - name: 'weblogic-domain-storage-volume'
69+
%LOG_HOME_ON_PV_PREFIX% persistentVolumeClaim:
70+
%LOG_HOME_ON_PV_PREFIX% claimName: '%DOMAIN_PVC_NAME%'
71+
%LOG_HOME_ON_PV_PREFIX%volumeMounts:
72+
%LOG_HOME_ON_PV_PREFIX% - name: 'weblogic-domain-storage-volume'
73+
%LOG_HOME_ON_PV_PREFIX% mountPath: %DOMAIN_ROOT_DIR%
8874

89-
# clusters is used to configure the desired behavior for starting member servers of a cluster.
90-
# If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
91-
clusters:
92-
- clusterName: %CLUSTER_NAME%
93-
replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
75+
# adminServer is used to configure the desired behavior for starting the administration server.
76+
adminServer:
77+
%EXPOSE_ANY_CHANNEL_PREFIX%adminService:
78+
%EXPOSE_ANY_CHANNEL_PREFIX% channels:
79+
# The Admin Server's NodePort
80+
%EXPOSE_ANY_CHANNEL_PREFIX% - channelName: default
81+
%EXPOSE_ADMIN_PORT_PREFIX% nodePort: %ADMIN_NODE_PORT%
82+
# Uncomment to export the T3Channel as a service
83+
%EXPOSE_T3_CHANNEL_PREFIX% - channelName: T3Channel
9484

85+
# References to Cluster resources that describe the lifecycle options for all
86+
# the Managed Server members of a WebLogic cluster, including Java
87+
# options, environment variables, additional Pod content, and the ability to
88+
# explicitly start, stop, or restart cluster members. The Cluster resource
89+
# must describe a cluster that already exists in the WebLogic domain
90+
# configuration.
91+
clusters:
92+
- name: %DOMAIN_UID%-%CLUSTER_NAME%
93+
94+
# Used by WDT's extractDomainResource script to generate a Cluster resource.
95+
clusters:
96+
- metadata:
97+
name: %DOMAIN_UID%-%CLUSTER_NAME%
98+
namespace: "%NAMESPACE%"
99+
spec:
100+
clusterName: %CLUSTER_NAME%
101+
replicas: %INITIAL_MANAGED_SERVER_REPLICAS%

‎kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wdt_k8s_model_template_updated.yaml

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
# Copyright (c) 2022, Oracle and/or its affiliates.
2+
3+
#
4+
# This is the template for kubernetes section for wdt_model file. This
5+
# will be appended to the wdt_model.yaml file so that we can use wdt's
6+
# extractDomainResource script to generate a domain.yaml
7+
#
8+
kubernetes:
9+
domain:
10+
metadata:
11+
name: %DOMAIN_UID%
12+
namespace: "%NAMESPACE%"
13+
spec:
14+
# The WebLogic Domain Home
15+
domainHome: %DOMAIN_HOME%
16+
17+
# The domain home source type
18+
# Set to PersistentVolume for domain-in-pv, Image for domain-in-image, or FromModel for model-in-image
19+
domainHomeSourceType: "%DOMAIN_HOME_SOURCE_TYPE%"
20+
21+
# The WebLogic Server Docker image that the Operator uses to start the domain
22+
image: "%WEBLOGIC_IMAGE%"
23+
24+
# imagePullPolicy defaults to "Always" if image version is :latest
25+
imagePullPolicy: %WEBLOGIC_IMAGE_PULL_POLICY%
26+
27+
# Identify which Secret contains the credentials for pulling an image
28+
%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
29+
%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX% - name: "%WEBLOGIC_IMAGE_PULL_SECRET_NAME%"
30+
# Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
31+
# how to create that Secret at the end of this file)
32+
webLogicCredentialsSecret:
33+
name: '%WEBLOGIC_CREDENTIALS_SECRET_NAME%'
34+
35+
# Whether to include the server out file into the pod's stdout, default is true
36+
includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
37+
38+
# Whether to enable log home
39+
%LOG_HOME_ON_PV_PREFIX%logHomeEnabled: %LOG_HOME_ENABLED%
40+
41+
# Whether to write HTTP access log file to log home
42+
#%LOG_HOME_ON_PV_PREFIX%httpAccessLogInLogHome: %HTTP_ACCESS_LOG_IN_LOG_HOME%
43+
44+
# The in-pod location for domain log, server logs, server out, and Node Manager log files
45+
%LOG_HOME_ON_PV_PREFIX%logHome: %LOG_HOME%
46+
# An (optional) in-pod location for data storage of default and custom file stores.
47+
# If not specified or the value is either not set or empty (e.g. dataHome: "") then the
48+
# data storage directories are determined from the WebLogic domain home configuration.
49+
dataHome: "%DATA_HOME%"
50+
51+
replicas: 2
52+
# serverStartPolicy legal values are "Never, "IfNeeded", or "AdminOnly"
53+
# This determines which WebLogic Servers the Operator will start up when it discovers this Domain
54+
# - "Never" will not start any server in the domain
55+
# - "AdminOnly" will start up only the administration server (no managed servers will be started)
56+
# - "IfNeeded" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
57+
serverStartPolicy: %SERVER_START_POLICY%
58+
59+
serverPod:
60+
# an (optional) list of environment variable to be set on the servers
61+
env:
62+
- name: JAVA_OPTIONS
63+
value: "%JAVA_OPTIONS%"
64+
- name: USER_MEM_ARGS
65+
value: "-Djava.security.egd=file:/dev/./urandom "
66+
%OPTIONAL_SERVERPOD_RESOURCES%
67+
%LOG_HOME_ON_PV_PREFIX%volumes:
68+
%LOG_HOME_ON_PV_PREFIX% - name: 'weblogic-domain-storage-volume'
69+
%LOG_HOME_ON_PV_PREFIX% persistentVolumeClaim:
70+
%LOG_HOME_ON_PV_PREFIX% claimName: '%DOMAIN_PVC_NAME%'
71+
%LOG_HOME_ON_PV_PREFIX%volumeMounts:
72+
%LOG_HOME_ON_PV_PREFIX% - name: 'weblogic-domain-storage-volume'
73+
%LOG_HOME_ON_PV_PREFIX% mountPath: %DOMAIN_ROOT_DIR%
74+
75+
# adminServer is used to configure the desired behavior for starting the administration server.
76+
adminServer:
77+
%EXPOSE_ANY_CHANNEL_PREFIX%adminService:
78+
%EXPOSE_ANY_CHANNEL_PREFIX% channels:
79+
# The Admin Server's NodePort
80+
%EXPOSE_ANY_CHANNEL_PREFIX% - channelName: default
81+
%EXPOSE_ADMIN_PORT_PREFIX% nodePort: %ADMIN_NODE_PORT%
82+
# Uncomment to export the T3Channel as a service
83+
%EXPOSE_T3_CHANNEL_PREFIX% - channelName: T3Channel
84+
85+
# References to Cluster resources that describe the lifecycle options for all
86+
# the Managed Server members of a WebLogic cluster, including Java
87+
# options, environment variables, additional Pod content, and the ability to
88+
# explicitly start, stop, or restart cluster members. The Cluster resource
89+
# must describe a cluster that already exists in the WebLogic domain
90+
# configuration.
91+
clusters:
92+
- name: %DOMAIN_UID%-%CLUSTER_NAME%
93+
- name: %DOMAIN_UID%-%CLUSTER_NAME2%
94+
95+
# Used by WDT's extractDomainResource script to generate Cluster resources.
96+
clusters:
97+
- metadata:
98+
name: %DOMAIN_UID%-%CLUSTER_NAME%
99+
namespace: "%NAMESPACE%"
100+
spec:
101+
clusterName: %CLUSTER_NAME%
102+
replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
103+
- metadata:
104+
name: %DOMAIN_UID%-%CLUSTER_NAME2%
105+
namespace: "%NAMESPACE%"
106+
spec:
107+
clusterName: %CLUSTER_NAME2%
108+
replicas: %INITIAL_MANAGED_SERVER_REPLICAS%

‎pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@
188188
<goals>
189189
<goal>exec</goal>
190190
</goals>
191-
<configuration>
192-
<executable>bash</executable>
193-
<arguments>
194-
<argument>../validateCLI.sh</argument>
195-
<argument>..</argument>
196-
</arguments>
191+
<configuration>
192+
<executable>bash</executable>
193+
<arguments>
194+
<argument>../validateCLI.sh</argument>
195+
<argument>..</argument>
196+
</arguments>
197197
</configuration>
198198
</execution>
199199
</executions>
@@ -659,7 +659,7 @@
659659
<assertj.core.version>3.23.1</assertj.core.version>
660660
<commons.io.version>2.11.0</commons.io.version>
661661
<awaitility-version>4.2.0</awaitility-version>
662-
<client-java-version>16.0.2</client-java-version>
662+
<client-java-version>17.0.0</client-java-version>
663663
<kotlin-stdlib-version>1.7.22</kotlin-stdlib-version>
664664
<okhttp-version>4.10.0</okhttp-version>
665665
<junit.jupiter.version>5.9.1</junit.jupiter.version>
@@ -675,7 +675,7 @@
675675
<jackson-databind-version>2.14.1</jackson-databind-version>
676676
<snakeyaml-version>1.33</snakeyaml-version>
677677
<gson-version>2.10</gson-version>
678-
<dependency-check-version>7.4.0</dependency-check-version>
678+
<dependency-check-version>7.4.1</dependency-check-version>
679679
<logback-classic-version>1.2.11</logback-classic-version>
680680
<root-generated-swagger>${project.basedir}/src-generated-swagger</root-generated-swagger>
681681
<src-generated-swagger>${root-generated-swagger}/main/java</src-generated-swagger>

0 commit comments

Comments
 (0)
Please sign in to comment.