@@ -19,14 +19,16 @@ import (
19
19
"time"
20
20
21
21
"k8s.io/apimachinery/pkg/util/wait"
22
+ "knative.dev/eventing/pkg/apis/eventing/v1beta1"
22
23
)
23
24
24
25
// LabelNamespaceForDefaultBroker adds label 'knative-eventing-injection=enabled' to the configured namespace
25
26
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 ... )
27
29
28
30
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 ())
30
32
}
31
33
32
34
return wait .PollImmediate (10 * time .Second , 5 * time .Minute , func () (bool , error ) {
@@ -41,8 +43,9 @@ func LabelNamespaceForDefaultBroker(r *KnRunResultCollector) error {
41
43
42
44
// UnlabelNamespaceForDefaultBroker removes label 'knative-eventing-injection=enabled' from the configured namespace
43
45
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 ... )
45
48
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 ())
47
50
}
48
51
}
0 commit comments