Merge branch 'backport-traefikimagefix' into 'release/4.0'

backport ItMiiSample* traefik image fix to release/4.0

See merge request weblogic-cloud/weblogic-kubernetes-operator!4226

Author: rjeberhard

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/TestActions.java

@@ -574,6 +574,17 @@ public static boolean installTraefik(TraefikParams params) {
     return Traefik.install(params);
   }
 
+  /**
+   * Upgrade Traefik ingress controller.
+   *
+   * @param params the parameters to upgrade command, such as image.repository, image.registry,
+   *               and image.tag
+   * @return true on success, false otherwise
+   */
+  public static boolean upgradeTraefikImage(TraefikParams params) {
+    return Traefik.upgradeTraefikImage(params);
+  }
+
   /**
    * Install Apache ingress controller.
    *

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Traefik.java

@@ -1,11 +1,14 @@
-// Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes.actions.impl;
 
 import oracle.weblogic.kubernetes.actions.impl.primitive.Helm;
 import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
 
+import static oracle.weblogic.kubernetes.actions.impl.primitive.Helm.exec;
+import static oracle.weblogic.kubernetes.actions.impl.primitive.Helm.valuesToString;
+
 public class Traefik {
   /**
    * install helm chart.
@@ -27,6 +30,37 @@ public static boolean upgrade(TraefikParams params) {
     return Helm.upgrade(params.getHelmParams(), params.getValues());
   }
 
+  /**
+   * Upgrade a helm release.
+   * @param params the helm parameters to override. This method is mainly to upgrade
+   *               Traefik image related infor, such as image.repository, image.registry,
+   *               and image.tag. See TraefikParams getValues() for more details
+   * @return true on success, false otherwise
+   */
+  public static boolean upgradeTraefikImage(TraefikParams params) {
+
+    HelmParams helmParams = params.getHelmParams();
+    String chartRef = null;
+
+    if (helmParams.getRepoUrl() != null && helmParams.getChartName() != null) {
+      if (helmParams.getRepoName() != null) {
+        chartRef = helmParams.getRepoName() + "/" + helmParams.getChartName();
+      } else {
+        chartRef = helmParams.getChartName() + " --repo " + helmParams.getRepoUrl();
+      }
+    }
+
+    // build Helm upgrade command
+    String upgradeCmd = String.format("helm upgrade %1s %2s --namespace %3s --reuse-values",
+        helmParams.getReleaseName(), chartRef,
+        helmParams.getNamespace());
+
+    // add override values
+    upgradeCmd = upgradeCmd + valuesToString(params.getValues());
+
+    return exec(upgradeCmd);
+  }
+
   /**
    * Uninstall a helm release.
    * @param params the parameters to helm uninstall command, release name and namespace

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/Helm.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes.actions.impl.primitive;
@@ -206,7 +206,7 @@ public static String valuesToString(Map<String, Object> helmValues) {
    * @param command the command to execute
    * @return true on success, false otherwise
    */
-  private static boolean exec(String command) {
+  public static boolean exec(String command) {
     getLogger().info("Running command - \n" + command);
     try {
       ExecResult result = ExecCommand.exec(command, true);

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2021, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes.utils;
@@ -29,6 +29,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
 import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
 import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
+import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_RELEASE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_DOWNLOAD_URL;
@@ -40,6 +41,7 @@
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
+import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.upgradeAndVerifyTraefik;
 import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -119,6 +121,7 @@ public void initAll(List<String> namespaces, DomainType domainTypeParam, ImageTy
     envMap.put("TRAEFIK_NAMESPACE", traefikNamespace);
     envMap.put("TRAEFIK_HTTP_NODEPORT", "0"); // 0-->dynamically choose the np
     envMap.put("TRAEFIK_HTTPS_NODEPORT", "0"); // 0-->dynamically choose the np
+    envMap.put("TRAEFIK_NAME", TRAEFIK_RELEASE_NAME + "-" + traefikNamespace.substring(3));
     envMap.put("WORKDIR", miiSampleWorkDir);
     envMap.put("BASE_IMAGE_NAME", WEBLOGIC_IMAGE_TO_USE_IN_SPEC
         .substring(0, WEBLOGIC_IMAGE_TO_USE_IN_SPEC.lastIndexOf(":")));
@@ -145,6 +148,8 @@ public void initAll(List<String> namespaces, DomainType domainTypeParam, ImageTy
 
     // install traefik using the mii sample script
     execTestScriptAndAssertSuccess(DomainType.WLS, "-traefik", "Traefik deployment failure");
+    //Helm upgrade traefik and verify traefik pod is ready
+    upgradeAndVerifyTraefik(traefikNamespace);
 
     logger.info("Setting up image registry secrets");
     // Create the repo secret to pull the domain image

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

@@ -66,6 +66,7 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.installTraefik;
 import static oracle.weblogic.kubernetes.actions.TestActions.installVoyager;
 import static oracle.weblogic.kubernetes.actions.TestActions.listIngresses;
+import static oracle.weblogic.kubernetes.actions.TestActions.upgradeTraefikImage;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.isApacheReady;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.isHelmReleaseDeployed;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.isNginxReady;
@@ -520,6 +521,41 @@ public static HelmParams installAndVerifyTraefik(String traefikNamespace,
     return traefikHelmParams;
   }
 
+  /** Upgrade Traefik and wait for up to five minutes for the Traefik pod to be ready.
+   *
+   * @param traefikNamespace the namespace in which the Traefik ingress controller is installed
+   * @return the Traefik Helm upgrade parameters
+   */
+  public static HelmParams upgradeAndVerifyTraefik(String traefikNamespace) {
+    LoggingFacade logger = getLogger();
+    // Helm install parameters
+    HelmParams traefikHelmParams = new HelmParams()
+        .releaseName(TRAEFIK_RELEASE_NAME + "-" + traefikNamespace.substring(3))
+        .namespace(traefikNamespace)
+        .repoUrl(TRAEFIK_REPO_URL)
+        .repoName(TRAEFIK_REPO_NAME)
+        .chartName(TRAEFIK_CHART_NAME);
+
+    // Traefik chart values to override
+    TraefikParams traefikParams = new TraefikParams()
+        .helmParams(traefikHelmParams);
+
+    // upgrade Traefik with new image infor
+    assertThat(upgradeTraefikImage(traefikParams))
+        .as("Test Traefik upgrade succeeds")
+        .withFailMessage("Traefik upgrade is failed")
+        .isTrue();
+
+    // wait until the Traefik pod is ready.
+    testUntil(
+        assertDoesNotThrow(() -> isTraefikReady(traefikNamespace), "isTraefikReady failed with ApiException"),
+        logger,
+        "Traefik to be ready in namespace {0}",
+        traefikNamespace);
+
+    return traefikHelmParams;
+  }
+
   /**
    * Create an ingress for the domain with domainUid in the specified namespace.
    *