Skip to content

[RELEASE-1.10] eventshub RBAC resources independent to avoid deletion conflicts #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow merged 1 commit into from
Aug 3, 2023
Merged

[RELEASE-1.10] eventshub RBAC resources independent to avoid deletion conflicts #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/eventshub/103-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ metadata:
{{ end }}
{{ end }}
spec:
serviceAccountName: "{{ .namespace }}"
serviceAccountName: "{{ .name }}"
restartPolicy: "OnFailure"
{{ if .podSecurityContext }}
securityContext:
Expand Down
6 changes: 3 additions & 3 deletions pkg/eventshub/eventshub_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func Example() {
// labels:
// app: eventshub-hubhub
// spec:
// serviceAccountName: "example"
// serviceAccountName: "hubhub"
// restartPolicy: "OnFailure"
// containers:
// - name: eventshub
Expand Down Expand Up @@ -152,7 +152,7 @@ func ExampleIstioAnnotation() {
// sidecar.istio.io/inject: "true"
// sidecar.istio.io/rewriteAppHTTPProbers: "true"
// spec:
// serviceAccountName: "example"
// serviceAccountName: "hubhub"
// restartPolicy: "OnFailure"
// containers:
// - name: eventshub
Expand Down Expand Up @@ -223,7 +223,7 @@ func ExampleNoReadiness() {
// labels:
// app: eventshub-hubhub
// spec:
// serviceAccountName: "example"
// serviceAccountName: "hubhub"
// restartPolicy: "OnFailure"
// containers:
// - name: eventshub
Expand Down
2 changes: 1 addition & 1 deletion pkg/eventshub/rbac/100-sa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .namespace }}
name: {{ .name }}
namespace: {{ .namespace }}
8 changes: 4 additions & 4 deletions pkg/eventshub/rbac/101-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ .namespace }}
name: {{ .name }}
namespace: {{ .namespace }}
rules:
- apiGroups: [ "" ]
Expand All @@ -35,13 +35,13 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ .namespace }}
name: {{ .name }}
namespace: {{ .namespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: {{ .namespace }}
name: {{ .name }}
subjects:
- kind: ServiceAccount
name: {{ .namespace }}
name: {{ .name }}
namespace: {{ .namespace }}
4 changes: 2 additions & 2 deletions pkg/eventshub/rbac/rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() feature.StepFn {
func Install(cfg map[string]interface{}) feature.StepFn {
return func(ctx context.Context, t feature.T) {
if _, err := manifest.InstallYamlFS(ctx, templates, map[string]interface{}{}); err != nil && !apierrors.IsAlreadyExists(err) {
if _, err := manifest.InstallYamlFS(ctx, templates, cfg); err != nil && !apierrors.IsAlreadyExists(err) {
t.Fatal(err)
}
}
Expand Down
11 changes: 6 additions & 5 deletions pkg/eventshub/rbac/rbac_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ func Example() {
ctx := testlog.NewContext()
files, err := manifest.ExecuteYAML(ctx, templates, nil,
map[string]interface{}{
"name": "examplen",
"namespace": "example",
})
if err != nil {
Expand All @@ -42,13 +43,13 @@ func Example() {
// apiVersion: v1
// kind: ServiceAccount
// metadata:
// name: example
// name: examplen
// namespace: example
// ---
// apiVersion: rbac.authorization.k8s.io/v1
// kind: Role
// metadata:
// name: example
// name: examplen
// namespace: example
// rules:
// - apiGroups: [ "" ]
Expand All @@ -66,14 +67,14 @@ func Example() {
// apiVersion: rbac.authorization.k8s.io/v1
// kind: RoleBinding
// metadata:
// name: example
// name: examplen
// namespace: example
// roleRef:
// apiGroup: rbac.authorization.k8s.io
// kind: Role
// name: example
// name: examplen
// subjects:
// - kind: ServiceAccount
// name: example
// name: examplen
// namespace: example
}
6 changes: 3 additions & 3 deletions pkg/eventshub/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ 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{}{
Expand All @@ -79,6 +76,9 @@ 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)
}
Expand Down