Skip to content

Commit c4fc3cf

Browse files
rjeberhardrjeberhard
committed
Merge remote-tracking branch 'origin/main' into release/4.0
2 parents 9e814fb + 0b46b46 commit c4fc3cf

23 files changed

+325
-1580
lines changed

‎Jenkinsfile.oke

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ pipeline {
137137
)
138138
string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
139139
description: '',
140-
defaultValue: '2.0.7'
140+
defaultValue: '2.1.1'
141141
)
142142
string(name: 'PROMETHEUS_CHART_VERSION',
143143
description: '',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ void testMiiDeleteDatasource() {
205205
Path pathToDeleteDSYaml = Paths.get(WORK_DIR + "/deleteds.yaml");
206206
String yamlToDeleteDS = "resources:\n"
207207
+ " JDBCSystemResource:\n";
208-
208+
209209
assertDoesNotThrow(() -> Files.write(pathToDeleteDSYaml, yamlToDeleteDS.getBytes()));
210210

211211
// Replace contents of an existing configMap with cm config

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ void testMiiChangeDataSourceParameterWithCommitUpdateAndRoll() {
331331
Path pathToDeleteDSYaml = Paths.get(WORK_DIR + "/deleteds.yaml");
332332
String yamlToDeleteDS = "resources:\n"
333333
+ " JDBCSystemResource:\n";
334-
334+
335335
assertDoesNotThrow(() -> Files.write(pathToDeleteDSYaml, yamlToDeleteDS.getBytes()));
336336

337337
pods = new LinkedHashMap<>();

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

Lines changed: 19 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, 2023, 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;
@@ -221,6 +221,24 @@ void testOperatorFmwUpgradeFrom344ToCurrent() {
221221
installAndUpgradeOperator("3.4.4", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
222222
}
223223

224+
/**
225+
* Operator upgrade from 4.0.3 to current with a FMW Domain.
226+
*/
227+
@Test
228+
@DisplayName("Upgrade Operator from 4.0.3 to current")
229+
void testOperatorFmwUpgradeFrom403ToCurrent() {
230+
installAndUpgradeOperator("4.0.3", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
231+
}
232+
233+
/**
234+
* Operator upgrade from 4.0.4 to current with a FMW Domain.
235+
*/
236+
@Test
237+
@DisplayName("Upgrade Operator from 4.0.4 to current")
238+
void testOperatorFmwUpgradeFrom404ToCurrent() {
239+
installAndUpgradeOperator("4.0.4", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
240+
}
241+
224242
private void installAndUpgradeOperator(
225243
String operatorVersion, String domainVersion,
226244
String externalServiceNameSuffix) {

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

Lines changed: 23 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, 2023, 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;
@@ -197,6 +197,28 @@ void testOperatorWlsUpgradeFrom344ToCurrent(String domainType) {
197197
installAndUpgradeOperator(domainType, "3.4.4", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
198198
}
199199

200+
/**
201+
* Operator upgrade from 4.0.3 to current.
202+
*/
203+
@ParameterizedTest
204+
@DisplayName("Upgrade Operator from 4.0.3 to current")
205+
@ValueSource(strings = { "Image", "FromModel" })
206+
void testOperatorWlsUpgradeFrom403ToCurrent(String domainType) {
207+
logger.info("Starting test testOperatorWlsUpgradeFrom403ToCurrent with domain type {0}", domainType);
208+
installAndUpgradeOperator(domainType, "4.0.3", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
209+
}
210+
211+
/**
212+
* Operator upgrade from 4.0.4 to current.
213+
*/
214+
@ParameterizedTest
215+
@DisplayName("Upgrade Operator from 4.0.4 to current")
216+
@ValueSource(strings = { "Image", "FromModel" })
217+
void testOperatorWlsUpgradeFrom404ToCurrent(String domainType) {
218+
logger.info("Starting test testOperatorWlsUpgradeFrom404ToCurrent with domain type {0}", domainType);
219+
installAndUpgradeOperator(domainType, "4.0.4", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
220+
}
221+
200222
/**
201223
* Auxiliary Image Domain upgrade from Operator 3.4.1 to current.
202224
*/

‎integration-tests/src/test/resources/bash-scripts/cpu.images.properties

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Copyright (c) 2023, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
# WebLogic CPU Release 14.1.1.0
5+
middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol7;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol7-cpu
6+
middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol8-cpu
7+
8+
middleware/weblogic_cpu:14.1.1.0-generic-jdk8-ol7;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk8-ol7-cpu
9+
middleware/weblogic_cpu:14.1.1.0-generic-jdk8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk8-ol8-cpu
10+
11+
middleware/weblogic_cpu:14.1.1.0-slim-jdk11-ol7;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk11-ol7-cpu
12+
middleware/weblogic_cpu:14.1.1.0-slim-jdk11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk11-ol8-cpu
13+
14+
middleware/weblogic_cpu:14.1.1.0-slim-jdk8-ol7;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk8-ol7-cpu
15+
middleware/weblogic_cpu:14.1.1.0-slim-jdk8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk8-ol8-cpu
16+
17+
# WebLogic CPU Release 12.2.1.4
18+
middleware/weblogic_cpu:12.2.1.4-generic-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.4-generic-jdk8-ol7-cpu
19+
middleware/weblogic_cpu:12.2.1.4-generic-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.4-generic-jdk8-ol8-cpu
20+
21+
middleware/weblogic_cpu:12.2.1.4-slim-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.4-slim-jdk8-ol7
22+
middleware/weblogic_cpu:12.2.1.4-slim-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.4-slim-jdk8-ol8-cpu
23+
24+
# WebLogic CPU Release 12.2.1.3
25+
middleware/weblogic_cpu:12.2.1.3-generic-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.3-generic-jdk8-ol7-cpu
26+
middleware/weblogic_cpu:12.2.1.3-generic-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.3-generic-jdk8-ol8-cpu
27+
28+
# FMW CPU Release 12.2.1.4
29+
middleware/fmw-infrastructure_cpu:12.2.1.4-jdk8-ol7;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-jdk8-ol7-cpu
30+
middleware/fmw-infrastructure_cpu:12.2.1.4-jdk8-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-jdk8-ol8-cpu
31+
32+
# FMW CPU Release 12.2.1.3
33+
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol7;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol7-cpu
34+
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol8-cpu

‎integration-tests/src/test/resources/bash-scripts/ga.images.properties

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Copyright (c) 2023, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
# WebLogic GA Release 14.1.1.0
5+
middleware/weblogic:14.1.1.0-11;weblogick8s/test-images/weblogic:14.1.1.0-11
6+
middleware/weblogic:14.1.1.0-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-11-ol8
7+
8+
middleware/weblogic:14.1.1.0-8;weblogick8s/test-images/weblogic:14.1.1.0-8
9+
middleware/weblogic:14.1.1.0-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-8-ol8
10+
11+
middleware/weblogic:14.1.1.0-slim-11;weblogick8s/test-images/weblogic:14.1.1.0-slim-11
12+
middleware/weblogic:14.1.1.0-slim-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-11-ol8
13+
14+
middleware/weblogic:14.1.1.0-slim-8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8
15+
middleware/weblogic:14.1.1.0-slim-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8-ol8
16+
17+
middleware/weblogic:14.1.1.0-dev-11;weblogick8s/test-images/weblogic:14.1.1.0-dev-11
18+
middleware/weblogic:14.1.1.0-dev-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-11-ol8
19+
20+
middleware/weblogic:14.1.1.0-dev-8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8
21+
middleware/weblogic:14.1.1.0-dev-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8-ol8
22+
23+
# WebLogic GA Release 12.2.1.4
24+
middleware/weblogic:12.2.1.4;weblogick8s/test-images/weblogic:12.2.1.4
25+
middleware/weblogic:12.2.1.4-ol8;weblogick8s/test-images/weblogic:12.2.1.4-ol8
26+
27+
middleware/weblogic:12.2.1.4-slim;weblogick8s/test-images/weblogic:12.2.1.4-slim
28+
middleware/weblogic:12.2.1.4-slim-ol8;weblogick8s/test-images/weblogic:12.2.1.4-slim-ol8
29+
30+
middleware/weblogic:12.2.1.4-dev;weblogick8s/test-images/weblogic:12.2.1.4-dev
31+
middleware/weblogic:12.2.1.4-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.4-dev-ol8
32+
33+
# WebLogic GA Release 12.2.1.3
34+
middleware/weblogic:12.2.1.3;weblogick8s/test-images/weblogic:12.2.1.3
35+
middleware/weblogic:12.2.1.3-ol8;weblogick8s/test-images/weblogic:12.2.1.3-ol8
36+
37+
middleware/weblogic:12.2.1.3-dev;weblogick8s/test-images/weblogic:12.2.1.3-dev
38+
middleware/weblogic:12.2.1.3-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.3-dev-ol8
39+
40+
# FMW GA Release 12.2.1.4
41+
middleware/fmw-infrastructure:12.2.1.4;weblogick8s/test-images/fmw-infrastructure:12.2.1.4
42+
middleware/fmw-infrastructure:12.2.1.4-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-ol8
43+
44+
# FMW GA Release 12.2.1.3
45+
middleware/fmw-infrastructure:12.2.1.3;weblogick8s/test-images/fmw-infrastructure:12.2.1.3
46+
middleware/fmw-infrastructure:12.2.1.3-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-ol8

‎integration-tests/src/test/resources/bash-scripts/images.properties

Lines changed: 78 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,100 @@
1-
# Absolute Source Image Location; Target Image Location w.r.t. Test reposiotory
1+
# Copyright (c) 2022,2023 Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
23

3-
# WebLogic Release 14.1.1.0
4-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-11;weblogick8s/test-images/weblogic:14.1.1.0-11
5-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-11-ol8
4+
# Format: Relative Source Image Location;Relative Target Image Location
5+
# Note:
6+
# The image location is relative with reference to SOURCE_REPO/TARGET_REPO
7+
# e.g. if SOURCE_REPO is container-registry.oracle.com
8+
# then the script expect the image to be pulled as follows ...
9+
# docker pull container-registry.oracle.com/middleware/weblogic:14.1.1.0-11
10+
# e.g. if TARGET_REPO is phx.ocir.io
11+
# then the script expect the image to be pushed as follows ...
12+
# docker push phx.ocir.io/test-images/weblogic/weblogic:14.1.1.0-11
613

7-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-8;weblogick8s/test-images/weblogic:14.1.1.0-8
8-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-8-ol8
14+
# WebLogic GA Release 14.1.1.0
15+
middleware/weblogic:14.1.1.0-11;weblogick8s/test-images/weblogic:14.1.1.0-11
16+
middleware/weblogic:14.1.1.0-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-11-ol8
917

10-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-slim-11;weblogick8s/test-images/weblogic:14.1.1.0-slim-11
11-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-slim-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-11-ol8
18+
middleware/weblogic:14.1.1.0-8;weblogick8s/test-images/weblogic:14.1.1.0-8
19+
middleware/weblogic:14.1.1.0-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-8-ol8
1220

13-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-slim-8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8
14-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-slim-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8-ol8
21+
middleware/weblogic:14.1.1.0-slim-11;weblogick8s/test-images/weblogic:14.1.1.0-slim-11
22+
middleware/weblogic:14.1.1.0-slim-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-11-ol8
1523

16-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-dev-11;weblogick8s/test-images/weblogic:14.1.1.0-dev-11
17-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-dev-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-11-ol8
24+
middleware/weblogic:14.1.1.0-slim-8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8
25+
middleware/weblogic:14.1.1.0-slim-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8-ol8
1826

19-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-dev-8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8
20-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-dev-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8-ol8
27+
middleware/weblogic:14.1.1.0-dev-11;weblogick8s/test-images/weblogic:14.1.1.0-dev-11
28+
middleware/weblogic:14.1.1.0-dev-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-11-ol8
2129

22-
# WebLogic Release 12.2.1.4
30+
middleware/weblogic:14.1.1.0-dev-8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8
31+
middleware/weblogic:14.1.1.0-dev-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8-ol8
2332

24-
container-registry.oracle.com/middleware/weblogic:12.2.1.4;weblogick8s/test-images/weblogic:12.2.1.4
25-
container-registry.oracle.com/middleware/weblogic:12.2.1.4-ol8;weblogick8s/test-images/weblogic:12.2.1.4-ol8
33+
# WebLogic GA Release 12.2.1.4
34+
middleware/weblogic:12.2.1.4;weblogick8s/test-images/weblogic:12.2.1.4
35+
middleware/weblogic:12.2.1.4-ol8;weblogick8s/test-images/weblogic:12.2.1.4-ol8
2636

27-
container-registry.oracle.com/middleware/weblogic:12.2.1.4-slim;weblogick8s/test-images/weblogic:12.2.1.4-slim
28-
container-registry.oracle.com/middleware/weblogic:12.2.1.4-slim-ol8;weblogick8s/test-images/weblogic:12.2.1.4-slim-ol8
37+
middleware/weblogic:12.2.1.4-slim;weblogick8s/test-images/weblogic:12.2.1.4-slim
38+
middleware/weblogic:12.2.1.4-slim-ol8;weblogick8s/test-images/weblogic:12.2.1.4-slim-ol8
2939

30-
container-registry.oracle.com/middleware/weblogic:12.2.1.4-dev;weblogick8s/test-images/weblogic:12.2.1.4-dev
31-
container-registry.oracle.com/middleware/weblogic:12.2.1.4-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.4-dev-ol8
40+
middleware/weblogic:12.2.1.4-dev;weblogick8s/test-images/weblogic:12.2.1.4-dev
41+
middleware/weblogic:12.2.1.4-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.4-dev-ol8
3242

33-
# WebLogic Release 12.2.1.3
43+
# WebLogic GA Release 12.2.1.3
44+
middleware/weblogic:12.2.1.3;weblogick8s/test-images/weblogic:12.2.1.3
45+
middleware/weblogic:12.2.1.3-ol8;weblogick8s/test-images/weblogic:12.2.1.3-ol8
3446

35-
container-registry.oracle.com/middleware/weblogic:12.2.1.3;weblogick8s/test-images/weblogic:12.2.1.3
36-
container-registry.oracle.com/middleware/weblogic:12.2.1.3-ol8;weblogick8s/test-images/weblogic:12.2.1.3-ol8
47+
middleware/weblogic:12.2.1.3-dev;weblogick8s/test-images/weblogic:12.2.1.3-dev
48+
middleware/weblogic:12.2.1.3-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.3-dev-ol8
3749

38-
container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev;weblogick8s/test-images/weblogic:12.2.1.3-dev
39-
container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.3-dev-ol8
50+
# FMW GA Release 12.2.1.4
51+
middleware/fmw-infrastructure:12.2.1.4;weblogick8s/test-images/fmw-infrastructure:12.2.1.4
52+
middleware/fmw-infrastructure:12.2.1.4-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-ol8
4053

41-
# FMW Release 12.2.1.4
54+
# FMW GA Release 12.2.1.3
55+
middleware/fmw-infrastructure:12.2.1.3;weblogick8s/test-images/fmw-infrastructure:12.2.1.3
56+
middleware/fmw-infrastructure:12.2.1.3-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-ol8
4257

43-
container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.4;weblogick8s/test-images/fmw-infrastructure:12.2.1.4
44-
container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.4-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-ol8
58+
# Oracle DB Image Release 12.2.0.1-slim
59+
database/enterprise:12.2.0.1-slim;weblogick8s/test-images/database/enterprise:12.2.0.1-slim
4560

46-
# FMW Release 12.2.1.3
47-
container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3;weblogick8s/test-images/fmw-infrastructure:12.2.1.3
48-
container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-ol8
61+
# Oracle DB Operator Image
62+
database/operator:0.2.0;weblogick8s/test-images/database/operator:0.2.0
4963

50-
# Oracle DB Image Release 12.2.0.1-slim
51-
container-registry.oracle.com/database/enterprise:12.2.0.1-slim;weblogick8s/test-images/database/enterprise:12.2.0.1-slim
64+
# Manually Update the Target Reposiotory for the following image(s)
65+
#busybox:1.34.1;weblogick8s/test-images/docker/busybox:1.34.1
66+
#elasticsearch:7.8.1;weblogick8s/test-images/docker/elasticsearch:7.8.1
67+
#k8s.gcr.io/ingress-nginx/controller:v1.2.0;weblogick8s/test-images/ingress-nginx/controller:v1.2.0
5268

53-
# BusyBox
54-
busybox:1.34.1;weblogick8s/test-images/docker/busybox:1.34.1
5569

56-
# NGINX Controller
57-
k8s.gcr.io/ingress-nginx/controller:v1.2.0;weblogick8s/test-images/ingress-nginx/controller:v1.2.0
70+
# WebLogic CPU Release 14.1.1.0
71+
middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol7;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol7-cpu
72+
middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol8-cpu
5873

59-
# Oracle DB Operator Image
60-
container-registry.oracle.com/database/operator:0.2.0;weblogick8s/test-images/database/operator:0.2.0
74+
middleware/weblogic_cpu:14.1.1.0-generic-jdk8-ol7;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk8-ol7-cpu
75+
middleware/weblogic_cpu:14.1.1.0-generic-jdk8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk8-ol8-cpu
76+
77+
middleware/weblogic_cpu:14.1.1.0-slim-jdk11-ol7;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk11-ol7-cpu
78+
middleware/weblogic_cpu:14.1.1.0-slim-jdk11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk11-ol8-cpu
79+
80+
middleware/weblogic_cpu:14.1.1.0-slim-jdk8-ol7;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk8-ol7-cpu
81+
middleware/weblogic_cpu:14.1.1.0-slim-jdk8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk8-ol8-cpu
82+
83+
# WebLogic CPU Release 12.2.1.4
84+
middleware/weblogic_cpu:12.2.1.4-generic-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.4-generic-jdk8-ol7-cpu
85+
middleware/weblogic_cpu:12.2.1.4-generic-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.4-generic-jdk8-ol8-cpu
86+
87+
middleware/weblogic_cpu:12.2.1.4-slim-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.4-slim-jdk8-ol7
88+
middleware/weblogic_cpu:12.2.1.4-slim-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.4-slim-jdk8-ol8-cpu
89+
90+
# WebLogic CPU Release 12.2.1.3
91+
middleware/weblogic_cpu:12.2.1.3-generic-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.3-generic-jdk8-ol7-cpu
92+
middleware/weblogic_cpu:12.2.1.3-generic-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.3-generic-jdk8-ol8-cpu
6193

62-
# ElasticSearch Image
63-
elasticsearch:7.8.1;weblogick8s/test-images/docker/elasticsearch:7.8.1
94+
# FMW CPU Release 12.2.1.4
95+
middleware/fmw-infrastructure_cpu:12.2.1.4-jdk8-ol7;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-jdk8-ol7-cpu
96+
middleware/fmw-infrastructure_cpu:12.2.1.4-jdk8-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-jdk8-ol8-cpu
6497

98+
# FMW CPU Release 12.2.1.3
99+
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol7;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol7-cpu
100+
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol8-cpu

0 commit comments

Comments
 (0)