Skip to content

Commit c212d54

Browse files
authored
Release/4.0 Avoid docker pull for logstash,kibana,fluentd images (#3949)
* Avoid docker pull dependency
1 parent c4c5c63 commit c212d54

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public interface TestConstants {
206206

207207
// ELK Stack and WebLogic logging exporter constants
208208
public static final String ELASTICSEARCH_NAME = "elasticsearch";
209-
public static final String ELASTICSEARCH_IMAGE_NAME = TEST_IMAGES_REPO
209+
public static final String ELASTICSEARCH_IMAGE_NAME = TEST_IMAGES_REPO
210210
+ "/weblogick8s/test-images/docker/elasticsearch";
211211
public static final String ELK_STACK_VERSION = "7.8.1";
212212
public static final String FLUENTD_IMAGE_VERSION =
@@ -231,8 +231,9 @@ public interface TestConstants {
231231
public static final String LOGSTASH_NAME = "logstash";
232232
public static final String LOGSTASH_IMAGE_NAME = TEST_IMAGES_REPO + "/weblogick8s/test-images/docker/logstash";
233233
public static final String LOGSTASH_IMAGE = LOGSTASH_IMAGE_NAME + ":" + ELK_STACK_VERSION;
234-
public static final String FLUENTD_IMAGE =
235-
TEST_IMAGES_REPO + "/weblogick8s/test-images/docker/fluentd-kubernetes-daemonset:" + FLUENTD_IMAGE_VERSION;
234+
public static final String FLUENTD_IMAGE = TEST_IMAGES_REPO
235+
+ "/weblogick8s/test-images/docker/fluentd-kubernetes-daemonset:"
236+
+ FLUENTD_IMAGE_VERSION;
236237
public static final String JAVA_LOGGING_LEVEL_VALUE = "INFO";
237238

238239
public static final String WLS_LOGGING_EXPORTER_YAML_FILE_NAME = "WebLogicLoggingExporter.yaml";

integration-tests/src/test/resources/bash-scripts/images.properties

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,12 @@ database/enterprise:12.2.0.1-slim;weblogick8s/test-images/database/enterprise:12
6161
# Oracle DB Operator Image
6262
database/operator:0.2.0;weblogick8s/test-images/database/operator:0.2.0
6363

64-
# Manually Update the Target Reposiotory for the following image(s)
64+
# Manually Update the Target Repository for the following image(s)
6565
#busybox:1.34.1;weblogick8s/test-images/docker/busybox:1.34.1
66-
#elasticsearch:7.8.1;weblogick8s/test-images/docker/elasticsearch:7.8.1
66+
#docker.elastic.co/elasticsearch/elasticsearch:7.8.1;weblogick8s/test-images/docker/elasticsearch:7.8.1
67+
#docker.elastic.co/elasticsearch/kibana:7.8.1;weblogick8s/test-images/docker/kibana:7.8.1
68+
#docker.elastic.co/elasticsearch/logstach:7.8.1;weblogick8s/test-images/docker/logstach:7.8.1
69+
#ghcr.io/verrazzano/fluentd-kubernetes-daemonset:v1.14.5-20230131231729-f85741b;weblogick8s/test-images/fluentd-kubernetes-daemonset:v1.14.5
6770
#k8s.gcr.io/ingress-nginx/controller:v1.2.0;weblogick8s/test-images/ingress-nginx/controller:v1.2.0
6871

6972

0 commit comments

Comments
 (0)