Merge branch 'xc-122644-42' into 'release/4.2'

rjeberhard · rjeberhard · commit 14eb840527a1 · 2024-10-09T20:20:37.000Z
don't install traefik in crio-pipeline

See merge request weblogic-cloud/weblogic-kubernetes-operator!4833
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java
@@ -311,7 +311,7 @@ public void beforeAll(ExtensionContext context) {
         //install webhook to prevent every operator installation trying to update crd
         installWebHookOnlyOperator("DomainOnPvSimplification=true");
         //install traefik when running with podman container runtime
-        if (!TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
+        if (!TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT) && !CRIO) {
           installTraefikLB();
         }
         //install Oracle Database operator as a one time task

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ public void beforeAll(ExtensionContext context) {`
`311`	`311`	`//install webhook to prevent every operator installation trying to update crd`
`312`	`312`	`installWebHookOnlyOperator("DomainOnPvSimplification=true");`
`313`	`313`	`//install traefik when running with podman container runtime`
`314`		`- if (!TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {`
	`314`	`+ if (!TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT) && !CRIO) {`
`315`	`315`	`installTraefikLB();`
`316`	`316`	`}`
`317`	`317`	`//install Oracle Database operator as a one time task`