updated traefik install due helm chart values change (#4131)

* updated traefik install due helm chart values change
oracle · Mar 29, 2023 · f2792ee · f2792ee
1 parent d5743af
commit f2792ee
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItWlsSamples.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItWlsSamples.java
@@ -54,6 +54,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.TEST_NGINX_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_NAME;
+import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_REGISTRY;
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG_DEFAULT;
@@ -428,6 +429,7 @@ void testTraefikIngressController() {
     setupSample(testSamplePath);
     Map<String, String> templateMap  = new HashMap<>();
     templateMap.put("TRAEFIK_INGRESS_IMAGE_NAME", TRAEFIK_INGRESS_IMAGE_NAME);
+    templateMap.put("TRAEFIK_INGRESS_IMAGE_REGISTRY", TRAEFIK_INGRESS_IMAGE_REGISTRY);
     Path srcPropFile = Paths.get(RESOURCE_DIR, "traefik.template.properties");
     Path targetPropFile = assertDoesNotThrow(
         () -> generateFileFromTemplate(srcPropFile.toString(), "traefik.properties", templateMap));

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java
@@ -181,8 +181,9 @@ public interface TestConstants {
   public static final String TRAEFIK_RELEASE_NAME = "traefik-release" + BUILD_ID;
   public static final String TRAEFIK_REPO_NAME = "traefik";
   public static final String TRAEFIK_CHART_NAME = "traefik";
-  public static final String TRAEFIK_INGRESS_IMAGE_NAME = TEST_IMAGES_REPO 
-           + "/weblogick8s/test-images/traefik-ingress/traefik";
+  public static final String TRAEFIK_INGRESS_IMAGE_NAME = "weblogick8s/test-images/traefik-ingress/traefik";
+  public static final String TRAEFIK_INGRESS_IMAGE_REGISTRY = TEST_IMAGES_REPO;
+
   public static final String TRAEFIK_INGRESS_IMAGE_TAG = "v2.9.6";
 
   // Voyager constants

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/TraefikParams.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/TraefikParams.java
@@ -10,6 +10,7 @@
 import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
 
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_NAME;
+import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_REGISTRY;
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_TAG;
 
 // All parameters needed to install Traefik Operator
@@ -21,10 +22,12 @@ public class TraefikParams {
   private HelmParams helmParams;
   private String traefikImage = TRAEFIK_INGRESS_IMAGE_NAME;
   private String traefikImageTag = TRAEFIK_INGRESS_IMAGE_TAG;
+  private String traefikRegistry = TRAEFIK_INGRESS_IMAGE_REGISTRY;
 
   private static final String NODEPORTS_HTTP = "ports.web.nodePort";
   private static final String NODEPORTS_HTTPS = "ports.websecure.nodePort";
   private static final String TRAEFIK_IMAGE = "image.repository";
+  private static final String TRAEFIK_IMAGE_REGISTRY = "image.registry";
   private static final String TRAEFIK_IMAGE_TAG = "image.tag";
 
   public TraefikParams nodePortsHttp(int nodePortsHttp) {
@@ -51,6 +54,11 @@ public TraefikParams traefikImage(String traefikImage) {
     return this;
   }
 
+  public TraefikParams traefikRegistry(String traefikRegistry) {
+    this.traefikRegistry = traefikRegistry;
+    return this;
+  }
+
   public TraefikParams traefikImageTag(String traefikImageTag) {
     this.traefikImageTag = traefikImageTag;
     return this;
@@ -72,6 +80,7 @@ public Map<String, Object> getValues() {
     }
 
     values.put(TRAEFIK_IMAGE, traefikImage);
+    values.put(TRAEFIK_IMAGE_REGISTRY, traefikRegistry);
     values.put(TRAEFIK_IMAGE_TAG, traefikImageTag);
 
     values.values().removeIf(Objects::isNull);

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonLBTestUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonLBTestUtils.java
@@ -444,6 +444,7 @@ private static boolean adminNodePortAccessible(int nodePort)
       for (int i = 1; i <= 10; i++) {
         getLogger().info("Iteration {0} out of 10: Accessing WebLogic console with url {1}", i, consoleUrl);
         final WebClient webClient = new WebClient();
+        webClient.getOptions().setThrowExceptionOnFailingStatusCode(false);
         final HtmlPage loginPage = assertDoesNotThrow(() -> webClient.getPage(consoleUrl),
             "connection to the WebLogic admin console failed");
         HtmlForm form = loginPage.getFormByName("loginData");

diff --git a/integration-tests/src/test/resources/traefik.template.properties b/integration-tests/src/test/resources/traefik.template.properties
@@ -1 +1 @@
---set image.repository=TRAEFIK_INGRESS_IMAGE_NAME
+--set image.repository=TRAEFIK_INGRESS_IMAGE_NAME --set image.registry=TRAEFIK_INGRESS_IMAGE_REGISTRY