diff --git a/vendor/knative.dev/reconciler-test/pkg/eventshub/103-pod.yaml b/vendor/knative.dev/reconciler-test/pkg/eventshub/103-pod.yaml index 5eaf4bd49b8..b49e07681a6 100644 --- a/vendor/knative.dev/reconciler-test/pkg/eventshub/103-pod.yaml +++ b/vendor/knative.dev/reconciler-test/pkg/eventshub/103-pod.yaml @@ -26,7 +26,7 @@ metadata: {{ end }} {{ end }} spec: - serviceAccountName: "{{ .name }}" + serviceAccountName: "{{ .namespace }}" restartPolicy: "OnFailure" {{ if .podSecurityContext }} securityContext: diff --git a/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/100-sa.yaml b/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/100-sa.yaml index f86b523942c..b949962725b 100644 --- a/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/100-sa.yaml +++ b/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/100-sa.yaml @@ -15,5 +15,5 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ .name }} + name: {{ .namespace }} namespace: {{ .namespace }} diff --git a/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/101-rbac.yaml b/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/101-rbac.yaml index dffe43896d3..5839e77b2a9 100644 --- a/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/101-rbac.yaml +++ b/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/101-rbac.yaml @@ -15,7 +15,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{ .name }} + name: {{ .namespace }} namespace: {{ .namespace }} rules: - apiGroups: [ "" ] @@ -35,13 +35,13 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ .name }} + name: {{ .namespace }} namespace: {{ .namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ .name }} + name: {{ .namespace }} subjects: - kind: ServiceAccount - name: {{ .name }} + name: {{ .namespace }} namespace: {{ .namespace }} diff --git a/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/rbac.go b/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/rbac.go index de8a2cfbde0..099b73a83b9 100644 --- a/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/rbac.go +++ b/vendor/knative.dev/reconciler-test/pkg/eventshub/rbac/rbac.go @@ -31,9 +31,9 @@ var templates embed.FS // Install creates the necessary ServiceAccount, Role, RoleBinding for the eventshub. // The resources are named according to the current namespace defined in the environment. -func Install(cfg map[string]interface{}) feature.StepFn { +func Install() feature.StepFn { return func(ctx context.Context, t feature.T) { - if _, err := manifest.InstallYamlFS(ctx, templates, cfg); err != nil && !apierrors.IsAlreadyExists(err) { + if _, err := manifest.InstallYamlFS(ctx, templates, map[string]interface{}{}); err != nil && !apierrors.IsAlreadyExists(err) { t.Fatal(err) } } diff --git a/vendor/knative.dev/reconciler-test/pkg/eventshub/resources.go b/vendor/knative.dev/reconciler-test/pkg/eventshub/resources.go index b2ba7dfd7fe..fdf97692cbd 100644 --- a/vendor/knative.dev/reconciler-test/pkg/eventshub/resources.go +++ b/vendor/knative.dev/reconciler-test/pkg/eventshub/resources.go @@ -67,6 +67,9 @@ func Install(name string, options ...EventsHubOption) feature.StepFn { eventListener := k8s.EventListenerFromContext(ctx) registerEventsHubStore(ctx, eventListener, name, namespace) + // Install ServiceAccount, Role, RoleBinding + eventshubrbac.Install()(ctx, t) + isReceiver := strings.Contains(envs["EVENT_GENERATORS"], "receiver") cfg := map[string]interface{}{ @@ -76,9 +79,6 @@ func Install(name string, options ...EventsHubOption) feature.StepFn { "withReadiness": isReceiver, } - // Install ServiceAccount, Role, RoleBinding - eventshubrbac.Install(cfg)(ctx, t) - if ic := environment.GetIstioConfig(ctx); ic.Enabled { manifest.WithIstioPodAnnotations(cfg) }