Remove End-to-end testing for legacy central ingress resources. (#618)

* remove e2es based on central ingress resources. Signed-off-by: Rodrigo Reis <[email protected]> * Remove source switchs e2es. Signed-off-by: Rodrigo Reis <[email protected]> * Adapt e2e tests to use segments. Signed-off-by: Rodrigo Reis <[email protected]> * Remove unused functions. Signed-off-by: Rodrigo Reis <[email protected]> * Update e2e howto. Signed-off-by: Rodrigo Reis <[email protected]> * Update e2e script. Signed-off-by: Rodrigo Reis <[email protected]> --------- Signed-off-by: Rodrigo Reis <[email protected]>
zalando-incubator · Apr 5, 2024 · f9310ce · f9310ce
1 parent b61c457
commit f9310ce
Show file tree

Hide file tree

Showing 15 changed files with 499 additions and 1,145 deletions.
diff --git a/cmd/e2e/README.md b/cmd/e2e/README.md
@@ -33,9 +33,9 @@ kubectl delete namespace foo; kubectl create namespace foo
 make
 ./build/stackset-controller --apiserver=http://127.0.0.1:8001 \
 --enable-configmap-support --enable-secret-support --enable-routegroup-support \
---enable-traffic-segments --annotated-traffic-segments \
+--enable-traffic-segments --controller-id=foo \
 --sync-ingress-annotation=example.org/i-haz-synchronize \
---sync-ingress-annotation=teapot.org/the-best --controller-id=foo \
+--sync-ingress-annotation=teapot.org/the-best \
 --cluster-domain=${CLUSTER_DOMAIN} --cluster-domain=${CLUSTER_DOMAIN_INTERNAL}
 ```
 4. rebuild e2e test and run e2e tests in `foo` namespace

diff --git a/cmd/e2e/annotations_sync_test.go b/cmd/e2e/annotations_sync_test.go
@@ -134,16 +134,10 @@ func TestSyncAnnotationsPropagateToSegments(t *testing.T) {
 			}
 			require.NoError(t, err)
 
-			_, err = waitForIngress(
-				t,
-				stacksetName+"-"+version+"-traffic-segment",
-			)
+			_, err = waitForIngressSegment(t, stacksetName, version)
 			require.NoError(t, err)
 
-			_, err = waitForRouteGroup(
-				t,
-				stacksetName+"-"+version+"-traffic-segment",
-			)
+			_, err = waitForRouteGroupSegment(t, stacksetName, version)
 			require.NoError(t, err)
 		}
 
@@ -152,10 +146,7 @@ func TestSyncAnnotationsPropagateToSegments(t *testing.T) {
 
 		for i := 0; i < len(tc.annotationsIng); i++ {
 			version := fmt.Sprintf("v%d", i)
-			ingress, err := waitForIngress(
-				t,
-				stacksetName+"-"+version+"-traffic-segment",
-			)
+			ingress, err := waitForIngressSegment(t, stacksetName, version)
 			require.NoError(t, err)
 
 			delete(
@@ -176,9 +167,10 @@ func TestSyncAnnotationsPropagateToSegments(t *testing.T) {
 				)
 			}
 
-			routeGroup, err := waitForRouteGroup(
+			routeGroup, err := waitForRouteGroupSegment(
 				t,
-				stacksetName+"-"+version+"-traffic-segment",
+				stacksetName,
+				version,
 			)
 			require.NoError(t, err)