Skip to content

Commit 4ee2dc4

Browse files
authored
Use broker injection label key from trigger types (#917)
- do not hard code as there is a change coming it in eventing v0.16 release
1 parent 4b62f20 commit 4ee2dc4

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

lib/test/broker.go

+7-4
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ import (
1919
"time"
2020

2121
"k8s.io/apimachinery/pkg/util/wait"
22+
"knative.dev/eventing/pkg/apis/eventing/v1beta1"
2223
)
2324

2425
// LabelNamespaceForDefaultBroker adds label 'knative-eventing-injection=enabled' to the configured namespace
2526
func LabelNamespaceForDefaultBroker(r *KnRunResultCollector) error {
26-
_, err := Kubectl{}.Run("label", "namespace", r.KnTest().Kn().Namespace(), "knative-eventing-injection=enabled")
27+
cmd := []string{"label", "namespace", r.KnTest().Kn().Namespace(), v1beta1.InjectionAnnotation + "=enabled"}
28+
_, err := Kubectl{}.Run(cmd...)
2729

2830
if err != nil {
29-
r.T().Fatalf("Error executing 'kubectl label namespace %s knative-eventing-injection=enabled'. Error: %s", r.KnTest().Kn().Namespace(), err.Error())
31+
r.T().Fatalf("error executing '%s': %s", strings.Join(cmd, " "), err.Error())
3032
}
3133

3234
return wait.PollImmediate(10*time.Second, 5*time.Minute, func() (bool, error) {
@@ -41,8 +43,9 @@ func LabelNamespaceForDefaultBroker(r *KnRunResultCollector) error {
4143

4244
// UnlabelNamespaceForDefaultBroker removes label 'knative-eventing-injection=enabled' from the configured namespace
4345
func UnlabelNamespaceForDefaultBroker(r *KnRunResultCollector) {
44-
_, err := Kubectl{}.Run("label", "namespace", r.KnTest().Kn().Namespace(), "knative-eventing-injection-")
46+
cmd := []string{"label", "namespace", r.KnTest().Kn().Namespace(), v1beta1.InjectionAnnotation + "-"}
47+
_, err := Kubectl{}.Run(cmd...)
4548
if err != nil {
46-
r.T().Fatalf("Error executing 'kubectl label namespace %s knative-eventing-injection-'. Error: %s", r.KnTest().Kn().Namespace(), err.Error())
49+
r.T().Fatalf("error executing '%s': %s", strings.Join(cmd, " "), err.Error())
4750
}
4851
}

0 commit comments

Comments
 (0)