Skip to content

Commit 1f29128

Browse files
rjeberhardrjeberhard
committed
Merge branch 'port-mr-4836' into 'main'
port MR 4836 from release/4.2 See merge request weblogic-cloud/weblogic-kubernetes-operator!4843
2 parents 601ae4e + 92fc8c7 commit 1f29128

17 files changed

+141
-59
lines changed

‎Jenkinsfile‎

Lines changed: 132 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,25 @@
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
//
44
def kind_k8s_map = [
5-
'0.19.0': [
6-
'1.27.1': 'kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b',
7-
'1.27': 'kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b',
8-
'1.26.4': 'kindest/node:v1.26.4@sha256:f4c0d87be03d6bea69f5e5dc0adb678bb498a190ee5c38422bf751541cebe92e',
9-
'1.26': 'kindest/node:v1.26.4@sha256:f4c0d87be03d6bea69f5e5dc0adb678bb498a190ee5c38422bf751541cebe92e',
10-
'1.25.9': 'kindest/node:v1.25.9@sha256:c08d6c52820aa42e533b70bce0c2901183326d86dcdcbedecc9343681db45161',
11-
'1.25': 'kindest/node:v1.25.9@sha256:c08d6c52820aa42e533b70bce0c2901183326d86dcdcbedecc9343681db45161',
12-
'1.24.13': 'kindest/node:v1.24.13@sha256:cea86276e698af043af20143f4bf0509e730ec34ed3b7fa790cc0bea091bc5dd',
13-
'1.24': 'kindest/node:v1.24.13@sha256:cea86276e698af043af20143f4bf0509e730ec34ed3b7fa790cc0bea091bc5dd',
14-
'1.23.17': 'kindest/node:v1.23.17@sha256:f77f8cf0b30430ca4128cc7cfafece0c274a118cd0cdb251049664ace0dee4ff',
15-
'1.23': 'kindest/node:v1.23.17@sha256:f77f8cf0b30430ca4128cc7cfafece0c274a118cd0cdb251049664ace0dee4ff',
16-
'1.22.17': 'kindest/node:v1.22.17@sha256:9af784f45a584f6b28bce2af84c494d947a05bd709151466489008f80a9ce9d5',
17-
'1.22': 'kindest/node:v1.22.17@sha256:9af784f45a584f6b28bce2af84c494d947a05bd709151466489008f80a9ce9d5',
18-
'1.21.14': 'kindest/node:v1.21.14@sha256:220cfafdf6e3915fbce50e13d1655425558cb98872c53f802605aa2fb2d569cf',
19-
'1.21': 'kindest/node:v1.21.14@sha256:220cfafdf6e3915fbce50e13d1655425558cb98872c53f802605aa2fb2d569cf'
5+
'0.23.0': [
6+
'1.30.0': 'kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e',
7+
'1.30': 'kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e',
8+
'1.29.4': 'kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8',
9+
'1.29': 'kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8',
10+
'1.28.9': 'kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0',
11+
'1.28': 'kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0',
12+
'1.27.13': 'kindest/node:v1.27.13@sha256:17439fa5b32290e3ead39ead1250dca1d822d94a10d26f1981756cd51b24b9d8',
13+
'1.27': 'kindest/node:v1.27.13@sha256:17439fa5b32290e3ead39ead1250dca1d822d94a10d26f1981756cd51b24b9d8',
14+
'1.26.15': 'kindest/node:v1.26.15@sha256:84333e26cae1d70361bb7339efb568df1871419f2019c80f9a12b7e2d485fe19',
15+
'1.26': 'kindest/node:v1.26.15@sha256:84333e26cae1d70361bb7339efb568df1871419f2019c80f9a12b7e2d485fe19',
16+
'1.25.16': 'kindest/node:v1.25.16@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b',
17+
'1.25': 'kindest/node:v1.25.16@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b'
2018
]
2119
]
2220
def _kind_image = null
2321

2422
pipeline {
25-
agent { label 'large' }
23+
agent { label 'large-ol9u4' }
2624
options {
2725
timeout(time: 800, unit: 'MINUTES')
2826
}
@@ -74,27 +72,25 @@ pipeline {
7472
choice(name: 'KIND_VERSION',
7573
description: 'Kind version.',
7674
choices: [
77-
'0.19.0'
75+
'0.23.0'
7876
]
7977
)
8078
choice(name: 'KUBE_VERSION',
81-
description: 'Kubernetes version. Supported values depend on the Kind version. Kind 0.18.0: 1.26, 1.26.3, 1.25, 1.25.8, 1.24, 1.24.12, 1.23, 1.23.17, 1.22, 1.22.17, 1.21, and 1.21.14. Kind 0.17.0: 1.25, 1.25.3, 1.24, 1.24.7, 1.23, 1.23.13, 1.22, 1.22.15, 1.21, 1.21.14, 1.20, and 1.20.15. Kind 0.16.0: 1.25, 1.25.2, 1.24, 1.24.6, 1.23, 1.23.12, 1.22, 1.22.15, 1.21, 1.21.14, 1.20, and 1.20.15. Kind 0.15.0: 1.25, 1.25.0, 1.24, 1.24.4, 1.23, 1.23.10, 1.22, 1.22.13, 1.21, 1.21.14, 1.20, and 1.20.15 ',
79+
description: 'Kubernetes version. Supported values depend on the Kind version. Kind 0.23.0: 1.30, 1.30.0, 1.29, 1.29.4, 1.28, 1.28.9, 1.27, 1.27.13, 1.26, 1.26.15, 1.25, 1.25.16 ',
8280
choices: [
8381
// The first item in the list is the default value...
84-
'1.27.1',
82+
'1.30.0',
83+
'1.30',
84+
'1.29.4',
85+
'1.29',
86+
'1.28.9',
87+
'1.28',
88+
'1.27.13',
8589
'1.27',
86-
'1.26.4',
90+
'1.26.15',
8791
'1.26',
88-
'1.25.9',
89-
'1.25',
90-
'1.24.13',
91-
'1.24',
92-
'1.23.17',
93-
'1.23',
94-
'1.22.17',
95-
'1.22',
96-
'1.21.14',
97-
'1.21'
92+
'1.25.16',
93+
'1.25'
9894
]
9995
)
10096
string(name: 'HELM_VERSION',
@@ -172,11 +168,11 @@ pipeline {
172168
)
173169
string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
174170
description: '',
175-
defaultValue: '2.0.7'
171+
defaultValue: '2.1.2'
176172
)
177173
string(name: 'PROMETHEUS_CHART_VERSION',
178174
description: '',
179-
defaultValue: '15.2.0'
175+
defaultValue: '17.0.0'
180176
)
181177
string(name: 'GRAFANA_CHART_VERSION',
182178
description: '',
@@ -216,7 +212,7 @@ pipeline {
216212
java -version
217213
mvn --version
218214
python --version
219-
docker version
215+
podman version
220216
ulimit -a
221217
ulimit -aH
222218
'''
@@ -356,14 +352,22 @@ pipeline {
356352
steps {
357353
sh '''
358354
export PATH=${runtime_path}
355+
export KIND_EXPERIMENTAL_PROVIDER=podman
356+
357+
podman version
358+
cat /etc/systemd/system/[email protected]/delegate.conf
359+
cat /etc/modules-load.d/iptables.conf
360+
lsmod|grep -E "^ip_tables|^iptable_filter|^iptable_nat|^ip6"
361+
359362
if kind delete cluster --name ${kind_name} --kubeconfig "${kubeconfig_file}"; then
360363
echo "Deleted orphaned kind cluster ${kind_name}"
361364
fi
365+
# settings needed by elastic logging tests
366+
echo "running sudo sysctl -w vm.max_map_count=262144"
367+
sudo sysctl -w vm.max_map_count=262144
362368
cat <<EOF | kind create cluster --name "${kind_name}" --kubeconfig "${kubeconfig_file}" --config=-
363369
kind: Cluster
364370
apiVersion: kind.x-k8s.io/v1alpha4
365-
networking:
366-
podSubnet: 192.168.0.0/16
367371
containerdConfigPatches:
368372
- |-
369373
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:${registry_port}"]
@@ -373,31 +377,106 @@ nodes:
373377
image: ${kind_image}
374378
- role: worker
375379
image: ${kind_image}
380+
extraPortMappings:
381+
- containerPort: 30511
382+
hostPort: 1511
383+
- containerPort: 32480
384+
hostPort: 2480
385+
- containerPort: 32490
386+
hostPort: 2490
387+
- containerPort: 30080
388+
hostPort: 2080
389+
- containerPort: 30443
390+
hostPort: 2043
391+
- containerPort: 30180
392+
hostPort: 2090
393+
- containerPort: 30143
394+
hostPort: 2053
395+
- containerPort: 31000
396+
hostPort: 2100
397+
- containerPort: 31004
398+
hostPort: 2104
399+
- containerPort: 31008
400+
hostPort: 2108
401+
- containerPort: 31012
402+
hostPort: 2112
403+
- containerPort: 31016
404+
hostPort: 2116
405+
- containerPort: 31020
406+
hostPort: 2120
407+
- containerPort: 31024
408+
hostPort: 2124
409+
- containerPort: 31028
410+
hostPort: 2128
411+
- containerPort: 31032
412+
hostPort: 2132
413+
- containerPort: 31036
414+
hostPort: 2136
415+
- containerPort: 31040
416+
hostPort: 2140
417+
- containerPort: 31044
418+
hostPort: 2144
419+
- containerPort: 31048
420+
hostPort: 2148
421+
- containerPort: 31052
422+
hostPort: 2152
423+
- containerPort: 31056
424+
hostPort: 2156
425+
- containerPort: 31060
426+
hostPort: 2160
427+
- containerPort: 31064
428+
hostPort: 2164
429+
- containerPort: 31068
430+
hostPort: 2168
431+
- containerPort: 31072
432+
hostPort: 2172
433+
- containerPort: 31076
434+
hostPort: 2176
435+
- containerPort: 31080
436+
hostPort: 2180
437+
- containerPort: 31084
438+
hostPort: 2184
439+
- containerPort: 31088
440+
hostPort: 2188
441+
- containerPort: 31092
442+
hostPort: 2192
443+
- containerPort: 31096
444+
hostPort: 2196
445+
- containerPort: 31100
446+
hostPort: 2200
447+
- containerPort: 31104
448+
hostPort: 2204
449+
- containerPort: 31108
450+
hostPort: 2208
451+
- containerPort: 31112
452+
hostPort: 2212
453+
- containerPort: 31116
454+
hostPort: 2216
455+
- containerPort: 31120
456+
hostPort: 2220
457+
- containerPort: 31124
458+
hostPort: 2224
459+
- containerPort: 31128
460+
hostPort: 2228
376461
extraMounts:
377462
- hostPath: ${pv_root}
378463
containerPath: ${pv_root}
464+
kubeadmConfigPatches:
465+
- |
466+
kind: KubeletConfiguration
467+
localStorageCapacityIsolation: true
379468
EOF
380469
381470
export KUBECONFIG=${kubeconfig_file}
382471
kubectl cluster-info --context "kind-${kind_name}"
383472
473+
podman info
474+
kubectl describe node
475+
384476
for node in $(kind get nodes --name "${kind_name}"); do
385477
kubectl annotate node ${node} tilt.dev/registry=localhost:${registry_port};
386478
done
387479
388-
if [ "${kind_network}" != "bridge" ]; then
389-
containers=$(docker network inspect ${kind_network} -f "{{range .Containers}}{{.Name}} {{end}}")
390-
needs_connect="true"
391-
for c in ${containers}; do
392-
if [ "$c" = "${registry_name}" ]; then
393-
needs_connect="false"
394-
fi
395-
done
396-
if [ "${needs_connect}" = "true" ]; then
397-
docker network connect "${kind_network}" "${registry_name}" || true
398-
fi
399-
fi
400-
401480
# Document the local registry
402481
# https://github.com/kubernetes/enhancements/tree/master/keps/sig-cluster-lifecycle/generic/1755-communicating-a-local-registry
403482
cat <<EOF | kubectl apply -f -
@@ -449,6 +528,7 @@ EOF
449528
MAVEN_PROFILE_NAME="integration-tests"
450529
echo "-Dit.test=\"${IT_TEST}\"" >> ${WORKSPACE}/.mvn/maven.config
451530
fi
531+
echo "-Dmaven.wagon.http.retryHandler.count=3" >> ${WORKSPACE}/.mvn/maven.config
452532
echo "-Dwko.it.wle.download.url=\"${wle_download_url}\"" >> ${WORKSPACE}/.mvn/maven.config
453533
echo "-Dwko.it.result.root=\"${result_root}\"" >> ${WORKSPACE}/.mvn/maven.config
454534
echo "-Dwko.it.pv.root=\"${pv_root}\"" >> ${WORKSPACE}/.mvn/maven.config
@@ -474,14 +554,15 @@ EOF
474554
echo "-Dwko.it.prometheus.chart.version=\"${PROMETHEUS_CHART_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
475555
echo "-Dwko.it.grafana.chart.version=\"${GRAFANA_CHART_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
476556
echo "-Dwko.it.collect.logs.on.success=\"${COLLECT_LOGS_ON_SUCCESS}\"" >> ${WORKSPACE}/.mvn/maven.config
557+
echo "-DWLSIMG_BUILDER=\"podman\"" >> ${WORKSPACE}/.mvn/maven.config
477558
echo "-Dwko.it.remoteconsole.version=\"${REMOTECONSOLE_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
478-
echo "-Djdk.httpclient.allowRestrictedHeaders=\"host\"" >> ${WORKSPACE}/.mvn/maven.config
479-
echo "-DOPERATOR_LOG_LEVEL=\"${OPERATOR_LOG_LEVEL}\"" >> ${WORKSPACE}/.mvn/maven.config
480-
559+
echo "-Djdk.httpclient.allowRestrictedHeaders=\"host\"" >> ${WORKSPACE}/.mvn/maven.config
560+
echo "-DOPERATOR_LOG_LEVEL=\"${OPERATOR_LOG_LEVEL}\"" >> ${WORKSPACE}/.mvn/maven.config
481561
482562
echo "${WORKSPACE}/.mvn/maven.config contents:"
483563
cat "${WORKSPACE}/.mvn/maven.config"
484564
cp "${WORKSPACE}/.mvn/maven.config" "${result_root}"
565+
kubectl describe node kind-worker
485566
'''
486567
withMaven(globalMavenSettingsConfig: 'wkt-maven-settings-xml', publisherStrategy: 'EXPLICIT') {
487568
withCredentials([

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ private static void buildApplicationsAndDomains() throws UnknownHostException {
422422
* participants, then the transaction should complete successfully
423423
*/
424424
@Test
425+
@Tag("gate")
425426
@DisplayName("Check cross domain transaction works")
426427
void testCrossDomainTransaction() throws IOException, InterruptedException {
427428
String url = String.format("http://%s/TxForward/TxForward?urls=t3://%s.%s:7001,"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
@Tag("olcne-mrg")
5656
@Tag("kind-parallel")
5757
@Tag("oke-parallel")
58+
@Tag("gate")
5859
class ItEvictedPodsCycling {
5960

6061
// constants for Domain

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
@IntegrationTest
117117
@DisabledOnSlimImage
118118
@Tag("olcne-mrg")
119+
@Tag("gate")
119120
class ItExternalLbTunneling {
120121

121122
private static String opNamespace = null;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
167167
@Test
168168
@DisabledIfEnvironmentVariable(named = "OKD", matches = "true")
169169
@DisplayName("Create a FMW domain on PV using simplified feature, Operator creates PV/PVC/RCU/Domain")
170-
@Tag("gate")
171170
void testOperatorCreatesPvPvcRcuDomain() {
172171
String domainUid = "jrfonpv-simplified";
173172
final String pvName = getUniqueName(domainUid + "-pv-");

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
@DisplayName("Test to a create MII domain and test autoscaling using HPA")
6666
@IntegrationTest
6767
@Tag("kind-parallel")
68+
@Tag("gate")
6869
public class ItHorizontalPodAutoscaler {
6970
private static String domainNamespace = null;
7071
static int replicaCount = 2;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
@Tag("oke-arm")
6161
@Tag("olcne-mrg")
6262
@Tag("oke-parallel")
63+
@Tag("gate")
6364
class ItIstioProductionSecureMode {
6465

6566
private static String opNamespace = null;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ public static void initAll(@Namespaces(6) List<String> namespaces) {
237237
*/
238238
@Test
239239
@DisplayName("Test domain events for various successful domain life cycle changes")
240-
@Tag("gate")
241240
void testK8SEventsSuccess() {
242241
OffsetDateTime timestamp = now();
243242
logger.info("Creating domain");

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ void testNameSpaceManageByRegularExpression() {
272272
@Order(2)
273273
@DisplayName("install operator helm chart and domain, "
274274
+ " using label namespace management")
275+
@Tag("gate")
275276
void testNameSpaceManagedByLabelSelector() {
276277
Map<String, String> managedByLabelDomains = new HashMap<>();
277278
managedByLabelDomains.put(domainNamespaces[0], domainsUid[0]);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ WEBLOGIC_IMAGE_TO_USE_IN_SPEC, adminSecretName, createSecretsForImageRepos(domai
305305
*/
306306
@Test
307307
@DisplayName("Test to update data source url in the domain using auxiliary image")
308-
@Tag("gate")
309308
void testUpdateDataSourceInDomainUsingAuxiliaryImage() {
310309

311310
// create stage dir for auxiliary image

0 commit comments

Comments
 (0)