Skip to content

Commit a7e0424

Browse files
committed
Merge branch 'traefik-fix' into 'main'
Use specific traefik chart version See merge request weblogic-cloud/weblogic-kubernetes-operator!4690
2 parents c3475b9 + fd62526 commit a7e0424

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ public interface TestConstants {
223223
public static final String TRAEFIK_RELEASE_NAME = "traefik-release" + BUILD_ID;
224224
public static final String TRAEFIK_REPO_NAME = "traefik";
225225
public static final String TRAEFIK_CHART_NAME = "traefik";
226+
public static final String TRAEFIK_CHART_VERSION = "25.0.0";
226227
public static final String TRAEFIK_INGRESS_IMAGE_NAME = TEST_IMAGES_TENANCY + "/test-images/traefik";
227228
public static final String TRAEFIK_INGRESS_IMAGE_REGISTRY = TEST_IMAGES_REPO;
228229

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,7 @@ public static boolean checkWeblogicMBean(String adminSvcExtHost,
12571257
if (TestConstants.KIND_CLUSTER
12581258
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
12591259
String channel = "internal-t3";
1260-
int port = getServicePort(domainNamespace, getExternalServicePodName(adminServerPodName),
1260+
int port = getServicePort(domainNamespace, adminServerPodName,
12611261
sslChannelName.isEmpty() ? channel : sslChannelName);
12621262
String domainName = adminServerPodName.split("-" + ADMIN_SERVER_NAME_BASE)[0];
12631263
String serviceName = ADMIN_SERVER_NAME_BASE;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
4444
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
4545
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_CHART_NAME;
46+
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_CHART_VERSION;
4647
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_RELEASE_NAME;
4748
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_REPO_NAME;
4849
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_REPO_URL;
@@ -248,7 +249,8 @@ public static TraefikParams installAndVerifyTraefik(String traefikNamespace,
248249
.namespace(traefikNamespace)
249250
.repoUrl(TRAEFIK_REPO_URL)
250251
.repoName(TRAEFIK_REPO_NAME)
251-
.chartName(TRAEFIK_CHART_NAME);
252+
.chartName(TRAEFIK_CHART_NAME)
253+
.chartVersion(TRAEFIK_CHART_VERSION);
252254

253255
// Traefik chart values to override
254256
TraefikParams traefikParams = new TraefikParams()

0 commit comments

Comments
 (0)