Merge branch 'owls110984' into 'release/3.4'

Backport removal of docker dependency for traefik to release/3.4

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

Author: rjeberhard

Jenkinsfile.kindnightly

@@ -138,6 +138,7 @@ pipeline {
                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',
                choices: [
                     // The first item in the list is the default value...
+                    '1.21.5',
                     '1.26.3',
                     '1.26',
                     '1.25.8',
@@ -169,7 +170,6 @@ pipeline {
                     '1.21.14',
                     '1.21.12',
                     '1.21.10',
-                    '1.21.5',
                     '1.21.1',
                     '1.21',
                     '1.20.15',
@@ -255,7 +255,7 @@ pipeline {
         )
         string(name: 'GRAFANA_CHART_VERSION',
                description: '',
-               defaultValue: '6.38.6'
+               defaultValue: '6.44.11'
         )
         booleanParam(name: 'COLLECT_LOGS_ON_SUCCESS',
                      description: 'Collect logs for successful runs. Default is false.',

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

@@ -9,16 +9,26 @@
 
 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
 public class TraefikParams {
 
   // Adding some of the most commonly used params for now
   private int nodePortsHttp;
   private int nodePortsHttps;
   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) {
     this.nodePortsHttp = nodePortsHttp;
@@ -39,6 +49,21 @@ public HelmParams getHelmParams() {
     return helmParams;
   }
 
+  public TraefikParams traefikImage(String traefikImage) {
+    this.traefikImage = traefikImage;
+    return this;
+  }
+
+  public TraefikParams traefikRegistry(String traefikRegistry) {
+    this.traefikRegistry = traefikRegistry;
+    return this;
+  }
+
+  public TraefikParams traefikImageTag(String traefikImageTag) {
+    this.traefikImageTag = traefikImageTag;
+    return this;
+  }
+
   /**
    * Loads Helm values into a value map.
    *
@@ -53,7 +78,9 @@ public Map<String, Object> getValues() {
     if (nodePortsHttps > 0) {
       values.put(NODEPORTS_HTTPS, nodePortsHttps);
     }
-
+    values.put(TRAEFIK_IMAGE, traefikImage);
+    values.put(TRAEFIK_IMAGE_REGISTRY, traefikRegistry);
+    values.put(TRAEFIK_IMAGE_TAG, traefikImageTag);
     values.values().removeIf(Objects::isNull);
     return values;
   }

integration-tests/src/test/resources/traefik.template.properties

@@ -0,0 +1 @@
+--set image.repository=TRAEFIK_INGRESS_IMAGE_NAME