Skip to content

NETOBSERV-2185: fix loki writer role name #1258

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
jotak merged 1 commit into from
Mar 17, 2025
Merged

NETOBSERV-2185: fix loki writer role name #1258

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
4 changes: 2 additions & 2 deletions controllers/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ const (
ConsoleNamespace = "openshift-console"

// [Cluster]Roles, must match names in config/rbac/component_roles.yaml (without netobserv- prefix)
LokiWriterRole ClusterRoleName = "netobserv-writer"
LokiReaderRole ClusterRoleName = "netobserv-reader"
LokiWriterRole ClusterRoleName = "netobserv-loki-writer"
LokiReaderRole ClusterRoleName = "netobserv-loki-reader"
PromReaderRole ClusterRoleName = "netobserv-metrics-reader"
ExposeMetricsRole RoleName = "netobserv-expose-metrics"
FLPInformersRole ClusterRoleName = "netobserv-informers"
Expand Down
8 changes: 4 additions & 4 deletions controllers/flp/flp_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ func ControllerSpecs() {
By("Not expecting Loki role (requires LokiStack)")
Eventually(func() interface{} {
return k8sClient.Get(ctx, rbKeyLokiWriterMono, &rbacv1.ClusterRoleBinding{})
}, timeout, interval).Should(MatchError(`clusterrolebindings.rbac.authorization.k8s.io "netobserv-writer-flp" not found`))
}, timeout, interval).Should(MatchError(`clusterrolebindings.rbac.authorization.k8s.io "netobserv-loki-writer-flp" not found`))

By("Not expecting transformer role bindings")
Eventually(func() interface{} {
Expand All @@ -186,7 +186,7 @@ func ControllerSpecs() {
}, timeout, interval).Should(MatchError(`clusterrolebindings.rbac.authorization.k8s.io "netobserv-informers-flptransfo" not found`))
Eventually(func() interface{} {
return k8sClient.Get(ctx, rbKeyLokiWriterTransfo, &rbacv1.ClusterRoleBinding{})
}, timeout, interval).Should(MatchError(`clusterrolebindings.rbac.authorization.k8s.io "netobserv-writer-flptransfo" not found`))
}, timeout, interval).Should(MatchError(`clusterrolebindings.rbac.authorization.k8s.io "netobserv-loki-writer-flptransfo" not found`))

By("Expecting flowlogs-pipeline-config configmap to be created")
Eventually(func() interface{} {
Expand Down Expand Up @@ -344,7 +344,7 @@ func ControllerSpecs() {
By("Not expecting Loki role (requires LokiStack)")
Eventually(func() interface{} {
return k8sClient.Get(ctx, rbKeyLokiWriterTransfo, &rbacv1.ClusterRoleBinding{})
}, timeout, interval).Should(MatchError(`clusterrolebindings.rbac.authorization.k8s.io "netobserv-writer-flptransfo" not found`))
}, timeout, interval).Should(MatchError(`clusterrolebindings.rbac.authorization.k8s.io "netobserv-loki-writer-flptransfo" not found`))

By("Not expecting mono role bindings")
Eventually(func() interface{} {
Expand All @@ -358,7 +358,7 @@ func ControllerSpecs() {
}, timeout, interval).Should(MatchError(`clusterrolebindings.rbac.authorization.k8s.io "netobserv-informers-flp" not found`))
Eventually(func() interface{} {
return k8sClient.Get(ctx, rbKeyLokiWriterMono, &rbacv1.ClusterRoleBinding{})
}, timeout, interval).Should(MatchError(`clusterrolebindings.rbac.authorization.k8s.io "netobserv-writer-flp" not found`))
}, timeout, interval).Should(MatchError(`clusterrolebindings.rbac.authorization.k8s.io "netobserv-loki-writer-flp" not found`))
})

It("Should delete previous flp deployment", func() {
Expand Down