Skip to content

Commit 80ba4a6

Browse files
marinakogddsharpe
authored andcommitted
Remove Apache and Voyager refs backport from main
1 parent a25f82c commit 80ba4a6

File tree

14 files changed

+1
-1174
lines changed

14 files changed

+1
-1174
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class ItExternalLbTunneling {
128128
private static Path tlsCertFile;
129129
private static Path tlsKeyFile;
130130
private static Path jksTrustFile;
131-
private static String tlsSecretName = domainUid + "-voyager-tls-secret";
131+
private static String tlsSecretName = domainUid + "-test-tls-secret";
132132
private String clusterSvcRouteHost = null;
133133

134134
/**

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

Lines changed: 0 additions & 285 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ public static void initAll(@Namespaces(5) List<String> namespaces) {
185185
domain2Uid = domainUids.get(1);
186186

187187
if (KIND_REPO != null) {
188-
// The kind clusters can't pull Apache webtier image from OCIR using the image pull secret.
189188
// Try the following instead:
190189
// 1. WLSIMG_BUILDER login
191190
// 2. WLSIMG_BUILDER pull

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -199,26 +199,6 @@ public interface TestConstants {
199199

200200
public static final String TRAEFIK_INGRESS_IMAGE_TAG = "v2.9.6";
201201

202-
// Voyager constants
203-
public static final String APPSCODE_REPO_URL = "https://charts.appscode.com/stable/";
204-
public static final String VOYAGER_RELEASE_NAME = "voyager-release" + BUILD_ID;
205-
public static final String APPSCODE_REPO_NAME = "appscode";
206-
public static final String VOYAGER_CHART_NAME = "voyager";
207-
public static final String VOYAGER_CHART_VERSION = "12.0.0";
208-
209-
// Apache constants
210-
public static final String APACHE_IMAGE_NAME_DEFAULT = "oracle/apache";
211-
public static final String APACHE_IMAGE_TAG_DEFAULT = "12.2.1.4";
212-
213-
// Get APACHE_IMAGE_NAME/APACHE_IMAGE_TAG from env var, if it is not provided use OCIR default image values
214-
public static final String APACHE_IMAGE_NAME = BASE_IMAGES_PREFIX
215-
+ getNonEmptySystemProperty("wko.it.apache.image.name", APACHE_IMAGE_NAME_DEFAULT);
216-
public static final String APACHE_IMAGE_TAG =
217-
getNonEmptySystemProperty("wko.it.apache.image.tag", APACHE_IMAGE_TAG_DEFAULT);
218-
public static final String APACHE_IMAGE = APACHE_IMAGE_NAME + ":" + APACHE_IMAGE_TAG;
219-
public static final String APACHE_RELEASE_NAME = "apache-release" + BUILD_ID;
220-
public static final String APACHE_SAMPLE_CHART_DIR = "../kubernetes/samples/charts/apache-webtier";
221-
222202
// ELK Stack and WebLogic logging exporter constants
223203
public static final String ELASTICSEARCH_NAME = "elasticsearch";
224204
public static final String ELASTICSEARCH_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY

0 commit comments

Comments
 (0)