Merge remote-tracking branch 'origin/main' into release/4.0

Author: rjeberhard

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, 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;
@@ -382,6 +382,7 @@ private static void createDomainCrAndVerify(String adminSecretName,
     final String volumeName = "weblogic-domain-storage-volume";
     final String logHomeRootPath = "/scratch";
     // create the domain CR
+    logger.info("Choosen FLUENTD_IMAGE {0}", FLUENTD_IMAGE);
     String imagePullPolicy = "IfNotPresent";
     FluentdSpecification fluentdSpecification = new FluentdSpecification();
     fluentdSpecification.setImage(FLUENTD_IMAGE);

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

@@ -123,7 +123,7 @@ public interface TestConstants {
   public static final String DB_IMAGE_TAG = getNonEmptySystemProperty("wko.it.db.image.tag", DB_IMAGE_TAG_DEFAULT);
 
   // WebLogic Base Image with Japanese Locale
-  public static final String LOCALE_IMAGE_NAME = "phx.ocir.io/weblogick8s/test-images/weblogic";
+  public static final String LOCALE_IMAGE_NAME = TEST_IMAGES_REPO + "/weblogick8s/test-images/weblogic";
   public static final String LOCALE_IMAGE_TAG = "12.2.1.4-jp";
 
   // For kind, replace repo name in image name with KIND_REPO, 
@@ -206,10 +206,11 @@ public interface TestConstants {
 
   // ELK Stack and WebLogic logging exporter constants
   public static final String ELASTICSEARCH_NAME = "elasticsearch";
-  public static final String ELASTICSEARCH_IMAGE_NAME = "phx.ocir.io/weblogick8s/test-images/docker/elasticsearch";
+  public static final String ELASTICSEARCH_IMAGE_NAME = TEST_IMAGES_REPO 
+         +  "/weblogick8s/test-images/docker/elasticsearch";
   public static final String ELK_STACK_VERSION = "7.8.1";
   public static final String FLUENTD_IMAGE_VERSION =
-      getNonEmptySystemProperty("wko.it.fluentd.image.version", "v1.14.5-debian-elasticsearch7-1.1");
+      getNonEmptySystemProperty("wko.it.fluentd.image.version", "v1.14.5");
   public static final String ELASTICSEARCH_IMAGE = ELASTICSEARCH_IMAGE_NAME + ":" + ELK_STACK_VERSION;
   public static final String ELASTICSEARCH_HOST = "elasticsearch.default.svc.cluster.local";
   public static final int DEFAULT_LISTEN_PORT = 7100;
@@ -223,12 +224,15 @@ public interface TestConstants {
   public static final String WEBLOGIC_INDEX_KEY = "wls";
   public static final String KIBANA_INDEX_KEY = "kibana";
   public static final String KIBANA_NAME = "kibana";
-  public static final String KIBANA_IMAGE = KIBANA_NAME + ":" + ELK_STACK_VERSION;
+  public static final String KIBANA_IMAGE_NAME = TEST_IMAGES_REPO + "/weblogick8s/test-images/docker/kibana";
+  public static final String KIBANA_IMAGE = KIBANA_IMAGE_NAME + ":" + ELK_STACK_VERSION;
   public static final String KIBANA_TYPE = "NodePort";
   public static final int KIBANA_PORT = 5601;
   public static final String LOGSTASH_NAME = "logstash";
-  public static final String LOGSTASH_IMAGE = LOGSTASH_NAME + ":" + ELK_STACK_VERSION;
-  public static final String FLUENTD_IMAGE = "fluent/fluentd-kubernetes-daemonset:" + FLUENTD_IMAGE_VERSION;
+  public static final String LOGSTASH_IMAGE_NAME = TEST_IMAGES_REPO + "/weblogick8s/test-images/docker/logstash";
+  public static final String LOGSTASH_IMAGE = LOGSTASH_IMAGE_NAME + ":" + ELK_STACK_VERSION;
+  public static final String FLUENTD_IMAGE = 
+       TEST_IMAGES_REPO + "/weblogick8s/test-images/docker/fluentd-kubernetes-daemonset:" + FLUENTD_IMAGE_VERSION;
   public static final String JAVA_LOGGING_LEVEL_VALUE = "INFO";
 
   public static final String WLS_LOGGING_EXPORTER_YAML_FILE_NAME = "WebLogicLoggingExporter.yaml";
@@ -240,7 +244,7 @@ public interface TestConstants {
   public static final String MII_AUXILIARY_IMAGE_NAME = DOMAIN_IMAGES_REPO + "mii-ai-image";
   public static final boolean SKIP_BUILD_IMAGES_IF_EXISTS =
       Boolean.parseBoolean(getNonEmptySystemProperty("wko.it.skip.build.images.if.exists", "false"));
-  public static final String BUSYBOX_IMAGE = "phx.ocir.io/weblogick8s/test-images/docker/busybox";
+  public static final String BUSYBOX_IMAGE = TEST_IMAGES_REPO + "/weblogick8s/test-images/docker/busybox";
   public static final String BUSYBOX_TAG = "1.34.1";
 
   // Skip the mii/wdt basic image build locally if needed

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, 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;
@@ -117,6 +117,7 @@ public static LoggingExporterParams installAndVerifyKibana(String namespace) {
         .loggingExporterNamespace(namespace)
         .kibanaContainerPort(KIBANA_PORT);
 
+    logger.info("Choosen KIBANA_IMAGE {0}", KIBANA_IMAGE);
     // install Kibana
     assertThat(installKibana(kibanaParams))
         .as("Kibana installation succeeds")

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/OperatorUtils.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;
@@ -440,6 +440,7 @@ public static OperatorParams installAndVerifyOperator(String opNamespace,
       if (!createLogStashConfigMap) {
         opParams.createLogStashConfigMap(createLogStashConfigMap);
       }
+      logger.info("Choosen LOGSTASH_IMAGE {0}", LOGSTASH_IMAGE);
       opParams.elkIntegrationEnabled(elkIntegrationEnabled);
       opParams.elasticSearchHost(elasticSearchHost);
       opParams.elasticSearchPort(ELASTICSEARCH_HTTP_PORT);