Sync annotation and improve naming in golden file tests

Signed-off-by: Lucas Thiesen <lucas.thiesen@zalando.de>
zalando-incubator · Oct 30, 2023 · 5618b11 · 5618b11
1 parent 4aff9d3
commit 5618b11
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 4 deletions.
diff --git a/...ss_rg_notshared_alb/input/k8s/01-ing.yaml → ...ed_rg_notshared_alb/input/k8s/01-ing.yaml b/...ss_rg_notshared_alb/input/k8s/01-ing.yaml → ...ed_rg_notshared_alb/input/k8s/01-ing.yaml
@@ -2,6 +2,8 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: myingress
+  annotations:
+    zalando.org/aws-load-balancer-shared: "true"
 spec:
   rules:
   - host: foo.bar.org
@@ -13,4 +15,4 @@ spec:
             port:
               name: main-port
         path: /
-        pathType: ImplementationSpecific
+        pathType: ImplementationSpecific
diff --git a/...ess_rg_notshared_alb/input/k8s/02-rg.yaml → ...red_rg_notshared_alb/input/k8s/02-rg.yaml b/...ess_rg_notshared_alb/input/k8s/02-rg.yaml → ...red_rg_notshared_alb/input/k8s/02-rg.yaml
diff --git a/...g_notshared_alb/output/params/01-ing.json → ...g_notshared_alb/output/params/01-ing.json b/...g_notshared_alb/output/params/01-ing.json → ...g_notshared_alb/output/params/01-ing.json
diff --git a/...rg_notshared_alb/output/params/02-rg.json → ...rg_notshared_alb/output/params/02-rg.json b/...rg_notshared_alb/output/params/02-rg.json → ...rg_notshared_alb/output/params/02-rg.json
diff --git a/..._rg_notshared_alb/output/tags/01-ing.json → ..._rg_notshared_alb/output/tags/01-ing.json b/..._rg_notshared_alb/output/tags/01-ing.json → ..._rg_notshared_alb/output/tags/01-ing.json
diff --git a/...s_rg_notshared_alb/output/tags/02-rg.json → ...d_rg_notshared_alb/output/tags/02-rg.json b/...s_rg_notshared_alb/output/tags/02-rg.json → ...d_rg_notshared_alb/output/tags/02-rg.json
diff --git a/..._notshared_alb/output/templates/01-ing.cf → ..._notshared_alb/output/templates/01-ing.cf b/..._notshared_alb/output/templates/01-ing.cf → ..._notshared_alb/output/templates/01-ing.cf
diff --git a/...g_notshared_alb/output/templates/02-rg.cf → ...g_notshared_alb/output/templates/02-rg.cf b/...g_notshared_alb/output/templates/02-rg.cf → ...g_notshared_alb/output/templates/02-rg.cf
diff --git a/testdata/ingress_rg_shared_alb/input/k8s/01-ing.yaml b/testdata/ingress_rg_shared_alb/input/k8s/01-ing.yaml
@@ -2,6 +2,8 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: myingress
+  annotations:
+    zalando.org/aws-load-balancer-shared: "true"
 spec:
   rules:
   - host: foo.bar.org
@@ -13,4 +15,4 @@ spec:
             port:
               name: main-port
         path: /
-        pathType: ImplementationSpecific
+        pathType: ImplementationSpecific
diff --git a/testdata/ingress_rg_shared_nlb/input/k8s/01-ing.yaml b/testdata/ingress_rg_shared_nlb/input/k8s/01-ing.yaml
@@ -2,6 +2,8 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: myingress
+  annotations:
+    zalando.org/aws-load-balancer-shared: "true"
 spec:
   rules:
   - host: foo.bar.org
@@ -13,4 +15,4 @@ spec:
             port:
               name: main-port
         path: /
-        pathType: ImplementationSpecific
+        pathType: ImplementationSpecific
diff --git a/worker_test.go b/worker_test.go
@@ -253,7 +253,7 @@ func TestResourceConversionOneToOne(tt *testing.T) {
 			},
 			typeLB: awsAdapter.LoadBalancerTypeNetwork,
 		}, {
-			name: "ingress_rg_notshared_alb",
+			name: "ing_shared_rg_notshared_alb",
 			responsesEC2: fake.EC2Outputs{DescribeInstancesPages: fake.MockDescribeInstancesPagesOutput(
 				nil,
 				fake.TestInstance{