[release-1.14] fix: trigger tests set annotations correctly now (#8053)

* fix: trigger tests set annotations correctly now Signed-off-by: Calum Murray <[email protected]> * fix: trigger dependencies are set correctly in test now Signed-off-by: Calum Murray <[email protected]> * fix trigger template Signed-off-by: Calum Murray <[email protected]> --------- Signed-off-by: Calum Murray <[email protected]> Co-authored-by: Calum Murray <[email protected]>
knative · Aug 26, 2024 · 3755819 · 3755819
1 parent 865f144
commit 3755819
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/test/rekt/features/trigger/feature.go b/test/rekt/features/trigger/feature.go
@@ -69,7 +69,8 @@ func TriggerDependencyAnnotation() *feature.Feature {
 	// Install the trigger
 	f.Setup("install trigger", trigger.Install(triggerName, brokerName, cfg...))
 
-	f.Setup("trigger goes ready", trigger.IsReady(triggerName))
+	// trigger won't go ready until after the pingsource exists, because of the dependency annotation
+	f.Requirement("trigger goes ready", trigger.IsReady(triggerName))
 
 	f.Requirement("install pingsource", func(ctx context.Context, t feature.T) {
 		brokeruri, err := broker.Address(ctx, brokerName)

diff --git a/test/rekt/resources/trigger/trigger.go b/test/rekt/resources/trigger/trigger.go
@@ -124,18 +124,14 @@ func WithSubscriberFromDestination(dest *duckv1.Destination) manifest.CfgFn {
 // WithAnnotations adds annotations to the trigger
 func WithAnnotations(annotations map[string]interface{}) manifest.CfgFn {
 	return func(cfg map[string]interface{}) {
-		if _, set := cfg["ceOverrides"]; !set {
-			cfg["ceOverrides"] = map[string]interface{}{}
+		if _, set := cfg["annotations"]; !set {
+			cfg["annotations"] = map[string]string{}
 		}
-		ceOverrides := cfg["ceOverrides"].(map[string]interface{})
 
 		if annotations != nil {
-			if _, set := ceOverrides["annotations"]; !set {
-				ceOverrides["annotations"] = map[string]interface{}{}
-			}
-			ceExt := ceOverrides["annotations"].(map[string]interface{})
+			annotation := cfg["annotations"].(map[string]string)
 			for k, v := range annotations {
-				ceExt[k] = v
+				annotation[k] = v.(string)
 			}
 		}
 	}

diff --git a/test/rekt/resources/trigger/trigger.yaml b/test/rekt/resources/trigger/trigger.yaml
@@ -20,7 +20,7 @@ metadata:
   {{ if .annotations }}
   annotations:
   {{ range $key, $value := .annotations }}
-    {{ $key }}: {{ $value }}
+    {{ $key }}: '{{ $value }}'
   {{ end }}
   {{ end }}
 spec: