Skip to content

Commit 2f49429

Browse files
authored
add ingress class when creating ingress (#3653)
1 parent 4576522 commit 2f49429

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,6 @@ public static void init(@Namespaces(3) List<String> namespaces) {
151151
@Test
152152
@DisplayName("Two cluster domain with a Coherence cluster and test interaction with cache data")
153153
void testMultiClusterCoherenceDomain() {
154-
String ingressName = domainUid + "-ingress-host-routing";
155-
String channelName = "tcp-80";
156-
157154
// create a DomainHomeInImage image using WebLogic Image Tool
158155
String domImage = createAndVerifyDomainImage();
159156

@@ -162,11 +159,8 @@ void testMultiClusterCoherenceDomain() {
162159

163160
if (OKD) {
164161
String cluster1HostName = domainUid + "-cluster-cluster-1";
165-
String cluster2HostName = domainUid + "-cluster-cluster-2";
166162

167163
final String cluster1IngressHost = createRouteForOKD(cluster1HostName, domainNamespace);
168-
final String cluster2IngressHost = createRouteForOKD(cluster2HostName, domainNamespace);
169-
170164

171165
// test adding data to the cache and retrieving them from the cache
172166
boolean testCompletedSuccessfully = assertDoesNotThrow(()
@@ -180,7 +174,8 @@ void testMultiClusterCoherenceDomain() {
180174
}
181175
// clusterNameMsPortMap.put(clusterName, managedServerPort);
182176
logger.info("Creating ingress for domain {0} in namespace {1}", domainUid, domainNamespace);
183-
createTraefikIngressForDomainAndVerify(domainUid, domainNamespace, 0, clusterNameMsPortMap, true, null);
177+
createTraefikIngressForDomainAndVerify(domainUid, domainNamespace, 0, clusterNameMsPortMap, true, null,
178+
traefikHelmParams.getReleaseName());
184179

185180
String clusterHostname = domainUid + "." + domainNamespace + ".cluster-1.test";
186181
// get ingress service Nodeport

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,7 @@ public static List<String> createIngressForDomainAndVerify(String domainUid,
672672
* @param clusterNameMSPortMap the map with key as cluster name and the value as managed server port of the cluster
673673
* @param setIngressHost if false does not set ingress host
674674
* @param tlsSecret name of the TLS secret if any
675+
* @param ingressTraefikClass the ingressClass for Traefik
675676
* @return list of ingress hosts
676677
*/
677678
public static List<String> createTraefikIngressForDomainAndVerify(
@@ -680,11 +681,11 @@ public static List<String> createTraefikIngressForDomainAndVerify(
680681
int nodeport,
681682
Map<String, Integer> clusterNameMSPortMap,
682683
boolean setIngressHost,
683-
String tlsSecret) {
684+
String tlsSecret,
685+
String ingressTraefikClass) {
684686

685687
LoggingFacade logger = getLogger();
686688
// create an ingress in domain namespace
687-
final String ingressTraefikClass = null;
688689
String ingressName = domainUid + "-" + ingressTraefikClass;
689690

690691
List<String> ingressHostList =

0 commit comments

Comments
 (0)