Skip to content

fix: escape reserved words from perses cel validation expressions #1091

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
openshift-merge-bot merged 1 commit into from
May 18, 2026
Merged

fix: escape reserved words from perses cel validation expressions #1091

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 bundle/manifests/observability-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ metadata:
certified: "false"
console.openshift.io/operator-monitoring-default: "true"
containerImage: observability-operator:1.3.0
createdAt: "2026-04-30T18:52:36Z"
createdAt: "2026-05-18T17:17:51Z"
description: A Go based Kubernetes operator to setup and manage highly available
Monitoring Stack using Prometheus, Alertmanager and Thanos Querier.
operatorframework.io/cluster-monitoring: "true"
Expand Down
12 changes: 6 additions & 6 deletions bundle/manifests/perses.dev_perses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3880,7 +3880,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
kubernetesAuth:
description: kubernetesAuth enables Kubernetes native authentication
for the Perses client
Expand Down Expand Up @@ -3959,7 +3959,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
tls:
description: tls provides TLS/SSL configuration for secure connections
to Perses
Expand Down Expand Up @@ -4010,7 +4010,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
enable:
description: enable determines whether TLS is enabled for
connections to Perses
Expand Down Expand Up @@ -4066,7 +4066,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
type: object
type: object
config:
Expand Down Expand Up @@ -6256,7 +6256,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
enable:
description: enable determines whether TLS is enabled for connections
to Perses
Expand Down Expand Up @@ -6310,7 +6310,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
type: object
tolerations:
description: tolerations allow pods to schedule onto nodes with matching
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/perses.dev_persesdatasources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
kubernetesAuth:
description: kubernetesAuth enables Kubernetes native authentication
for the Perses client
Expand Down Expand Up @@ -472,7 +472,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
tls:
description: tls provides TLS/SSL configuration for secure connections
to Perses
Expand Down Expand Up @@ -523,7 +523,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
enable:
description: enable determines whether TLS is enabled for
connections to Perses
Expand Down Expand Up @@ -579,7 +579,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
type: object
type: object
config:
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/perses.dev_persesglobaldatasources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
kubernetesAuth:
description: kubernetesAuth enables Kubernetes native authentication
for the Perses client
Expand Down Expand Up @@ -180,7 +180,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
tls:
description: tls provides TLS/SSL configuration for secure connections
to Perses
Expand Down Expand Up @@ -231,7 +231,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
enable:
description: enable determines whether TLS is enabled for
connections to Perses
Expand Down Expand Up @@ -287,7 +287,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
type: object
type: object
config:
Expand Down
12 changes: 6 additions & 6 deletions deploy/perses/crds/perses.dev_perses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3869,7 +3869,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
kubernetesAuth:
description: kubernetesAuth enables Kubernetes native authentication
for the Perses client
Expand Down Expand Up @@ -3948,7 +3948,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
tls:
description: tls provides TLS/SSL configuration for secure connections
to Perses
Expand Down Expand Up @@ -3999,7 +3999,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
enable:
description: enable determines whether TLS is enabled for
connections to Perses
Expand Down Expand Up @@ -4055,7 +4055,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
type: object
type: object
config:
Expand Down Expand Up @@ -6245,7 +6245,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
enable:
description: enable determines whether TLS is enabled for connections
to Perses
Expand Down Expand Up @@ -6299,7 +6299,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
type: object
tolerations:
description: tolerations allow pods to schedule onto nodes with matching
Expand Down
8 changes: 4 additions & 4 deletions deploy/perses/crds/perses.dev_persesdatasources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
kubernetesAuth:
description: kubernetesAuth enables Kubernetes native authentication
for the Perses client
Expand Down Expand Up @@ -471,7 +471,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
tls:
description: tls provides TLS/SSL configuration for secure connections
to Perses
Expand Down Expand Up @@ -522,7 +522,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
enable:
description: enable determines whether TLS is enabled for
connections to Perses
Expand Down Expand Up @@ -578,7 +578,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
type: object
type: object
config:
Expand Down
8 changes: 4 additions & 4 deletions deploy/perses/crds/perses.dev_persesglobaldatasources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
kubernetesAuth:
description: kubernetesAuth enables Kubernetes native authentication
for the Perses client
Expand Down Expand Up @@ -169,7 +169,7 @@ spec:
- message: name is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap' || has(self.namespace)
rule: self.type != 'secret' && self.type != 'configmap' || has(self.__namespace__)
tls:
description: tls provides TLS/SSL configuration for secure connections
to Perses
Expand Down Expand Up @@ -220,7 +220,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
enable:
description: enable determines whether TLS is enabled for
connections to Perses
Expand Down Expand Up @@ -276,7 +276,7 @@ spec:
|| has(self.name)
- message: namespace is required when type is secret or configmap
rule: self.type != 'secret' && self.type != 'configmap'
|| has(self.namespace)
|| has(self.__namespace__)
type: object
type: object
config:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/rhobs/observability-operator/pkg/apis v0.0.0-20251009091129-76135c924ed6
github.com/rhobs/openshift-api v0.0.0-20260512142436-2e89e902a420
github.com/rhobs/perses v0.0.0-20260422074433-2c06d5cd1312
github.com/rhobs/perses-operator v0.1.10-0.20260422102948-9bec730aa616
github.com/rhobs/perses-operator v0.1.10-0.20260518165420-4a0e166ccfca
github.com/stretchr/testify v1.11.1
go.uber.org/zap v1.27.1
golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,8 @@ github.com/rhobs/openshift-api v0.0.0-20260512142436-2e89e902a420 h1:7e9fFgSnTQH
github.com/rhobs/openshift-api v0.0.0-20260512142436-2e89e902a420/go.mod h1:W0V3SoeXIKmaTN3pqMKDiLZ23rc9viuqYenk9+89N+o=
github.com/rhobs/perses v0.0.0-20260422074433-2c06d5cd1312 h1:FIHpZaFw4s8KwL1MbBbehbhnaIoWqK9w6BQHp8qtk50=
github.com/rhobs/perses v0.0.0-20260422074433-2c06d5cd1312/go.mod h1:1eTdHfUEzWvkpxzblN5MeXnvcTLoMFSXcAl1rbdEkJo=
github.com/rhobs/perses-operator v0.1.10-0.20260422102948-9bec730aa616 h1:pBAB0AH1JT21OkD8wpoxeTuPot9mWQWo2KYRKaCzPMo=
github.com/rhobs/perses-operator v0.1.10-0.20260422102948-9bec730aa616/go.mod h1:REkyhfFzgup4/wvVoTPDFtKFz/1xWG24P0I1+1eRbMU=
github.com/rhobs/perses-operator v0.1.10-0.20260518165420-4a0e166ccfca h1:2C6DuqBYT8MkHBEXIc2kF9xrXvQh2Ifp7l+Xcy1HtwU=
github.com/rhobs/perses-operator v0.1.10-0.20260518165420-4a0e166ccfca/go.mod h1:ZduotU/1fKgK0r1LGMRIKftKE0LWofh1j97p+XCsplA=
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
Expand Down
Loading