Merge pull request #3 from projectsyn/fix-lb-annotations

HappyTetrahedron · web-flow · commit f68c75f2a32d · 2025-07-02T12:54:45.000+02:00
Do not generate invalid yaml for loadbalancer service annotation automation
diff --git a/component/service-loadbalancer-default-annotations.jsonnet b/component/service-loadbalancer-default-annotations.jsonnet
@@ -75,7 +75,7 @@ local managedresource =
 
 if std.length(params.serviceLoadBalancerDefaultAnnotations) > 0 then
   {
-    '50_service_loadbalancer_default_annotations_rbac': [ namespace, sa, cr, crb ],
+    '50_service_loadbalancer_default_annotations_rbac': [ sa, cr, crb ],
     '50_service_loadbalancer_default_annotations_managedresource': [ jsonnetlib, managedresource ],
   }
 else
diff --git a/tests/golden/defaults/exoscale-cloud-controller-manager/exoscale-cloud-controller-manager/support/50_service_loadbalancer_default_annotations_rbac.yaml b/tests/golden/defaults/exoscale-cloud-controller-manager/exoscale-cloud-controller-manager/support/50_service_loadbalancer_default_annotations_rbac.yaml
@@ -1,5 +1,3 @@
-syn-exoscale-cloud-controller-manager
----
 apiVersion: v1
 kind: ServiceAccount
 metadata:

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ local managedresource =`
`75`	`75`
`76`	`76`	`if std.length(params.serviceLoadBalancerDefaultAnnotations) > 0 then`
`77`	`77`	`{`
`78`		`- '50_service_loadbalancer_default_annotations_rbac': [ namespace, sa, cr, crb ],`
	`78`	`+ '50_service_loadbalancer_default_annotations_rbac': [ sa, cr, crb ],`
`79`	`79`	`'50_service_loadbalancer_default_annotations_managedresource': [ jsonnetlib, managedresource ],`
`80`	`80`	`}`
`81`	`81`	`else`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-syn-exoscale-cloud-controller-manager`
`2`		`----`
`3`	`1`	`apiVersion: v1`
`4`	`2`	`kind: ServiceAccount`
`5`	`3`	`metadata:`