[release-1.18] Fix hardcoded knative-eventing namespace (#8578)

knative-prow-robot · matzew · web-flow · commit 5b7ba59219dc · 2025-04-30T04:02:06.000Z
* dizzy: Remove hard-coded knative-eventing namespace and replace with system.Namespace() and touch test to get that properly injected

Signed-off-by: Matthias Wessendorf &lt;mwessend@redhat.com&gt;

* broom: Remove yet another hard-coded instance of knative-eventing

Signed-off-by: Matthias Wessendorf &lt;mwessend@redhat.com&gt;

---------

Signed-off-by: Matthias Wessendorf &lt;mwessend@redhat.com&gt;
Co-authored-by: Matthias Wessendorf &lt;mwessend@redhat.com&gt;
diff --git a/pkg/apis/messaging/v1/in_memory_channel_validation.go b/pkg/apis/messaging/v1/in_memory_channel_validation.go
@@ -22,11 +22,13 @@ import (
 
 	"knative.dev/pkg/apis"
 	"knative.dev/pkg/kmp"
+	"knative.dev/pkg/system"
 
 	"knative.dev/eventing/pkg/apis/eventing"
+	_ "knative.dev/pkg/system/testing"
 )
 
-const eventingControllerSAName = "system:serviceaccount:knative-eventing:eventing-controller"
+var eventingControllerSAName = fmt.Sprintf("%s:%s:%s", "system:serviceaccount", system.Namespace(), "eventing-controller")
 
 func (imc *InMemoryChannel) Validate(ctx context.Context) *apis.FieldError {
 	errs := imc.Spec.Validate(ctx).ViaField("spec")
diff --git a/pkg/apis/messaging/v1/in_memory_channel_validation_test.go b/pkg/apis/messaging/v1/in_memory_channel_validation_test.go
@@ -17,8 +17,11 @@ limitations under the License.
 package v1
 
 import (
+	"fmt"
 	"testing"
 
+	"knative.dev/pkg/system"
+
 	"golang.org/x/net/context"
 	authenticationv1 "k8s.io/api/authentication/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -139,7 +142,7 @@ func TestInMemoryChannelValidation(t *testing.T) {
 		want: func() *apis.FieldError {
 			diff, _ := kmp.ShortDiff(validIMCSingleSubscriber.Spec.Subscribers, validIMCTwoSubscribers.Spec.Subscribers)
 			return &apis.FieldError{
-				Message: "Channel.Spec.Subscribers changed by user test-user which was not the system:serviceaccount:knative-eventing:eventing-controller service account",
+				Message: fmt.Sprintf("%s:%s:%s", "Channel.Spec.Subscribers changed by user test-user which was not the system:serviceaccount", system.Namespace(), "eventing-controller service account"),
 				Paths:   []string{"spec.subscribers"},
 				Details: diff,
 			}
diff --git a/pkg/reconciler/broker/resources/eventpolicy.go b/pkg/reconciler/broker/resources/eventpolicy.go
@@ -17,17 +17,21 @@ limitations under the License.
 package resources
 
 import (
+	"fmt"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
 	eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
 	eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
 	eventingv1alpha1 "knative.dev/eventing/pkg/apis/eventing/v1alpha1"
 	"knative.dev/pkg/kmeta"
+	"knative.dev/pkg/system"
 )
 
+var OIDCBrokerSub = fmt.Sprintf("%s:%s:%s", "system:serviceaccount", system.Namespace(), "mt-broker-ingress-oidc")
+
 const (
 	BackingChannelEventPolicyLabelPrefix = "eventing.knative.dev/"
-	OIDCBrokerSub                        = "system:serviceaccount:knative-eventing:mt-broker-ingress-oidc"
 	brokerKind                           = "Broker"
 )
 
