From 78afecce27a235c768a7b3013399516b507fa017 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Wed, 18 Mar 2026 10:06:21 +0000 Subject: [PATCH] chore: Update manifests after automerge --- .../grafana-operator/ClusterRole-grafana-operator.yaml | 4 ++-- .../ClusterRoleBinding-grafana-operator.yaml | 4 ++-- ...ition-grafanamanifests.grafana.integreatly.org.yaml | 2 +- ...nanotificationpolicies.grafana.integreatly.org.yaml | 2 +- ...rceDefinition-grafanas.grafana.integreatly.org.yaml | 4 ++++ .../grafana-operator/Deployment-grafana-operator.yaml | 10 +++++----- .../grafana-operator/Role-grafana-operator-leases.yaml | 4 ++-- .../RoleBinding-grafana-operator-leases.yaml | 4 ++-- .../Service-grafana-operator-metrics-service.yaml | 4 ++-- .../ServiceAccount-grafana-operator.yaml | 4 ++-- .../ServiceMonitor-grafana-operator.yaml | 4 ++-- 11 files changed, 25 insertions(+), 21 deletions(-) diff --git a/clusters/cl01tl/manifests/grafana-operator/ClusterRole-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ClusterRole-grafana-operator.yaml index 9edffa8d4..a6c943d53 100644 --- a/clusters/cl01tl/manifests/grafana-operator/ClusterRole-grafana-operator.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/ClusterRole-grafana-operator.yaml @@ -3,10 +3,10 @@ kind: ClusterRole metadata: name: grafana-operator labels: - helm.sh/chart: grafana-operator-5.22.1 + helm.sh/chart: grafana-operator-5.22.2 app.kubernetes.io/name: grafana-operator app.kubernetes.io/instance: grafana-operator - app.kubernetes.io/version: "v5.22.1" + app.kubernetes.io/version: "v5.22.2" app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/component: operator diff --git a/clusters/cl01tl/manifests/grafana-operator/ClusterRoleBinding-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ClusterRoleBinding-grafana-operator.yaml index ff3a24304..4a08c482b 100644 --- a/clusters/cl01tl/manifests/grafana-operator/ClusterRoleBinding-grafana-operator.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/ClusterRoleBinding-grafana-operator.yaml @@ -3,10 +3,10 @@ kind: ClusterRoleBinding metadata: name: grafana-operator labels: - helm.sh/chart: grafana-operator-5.22.1 + helm.sh/chart: grafana-operator-5.22.2 app.kubernetes.io/name: grafana-operator app.kubernetes.io/instance: grafana-operator - app.kubernetes.io/version: "v5.22.1" + app.kubernetes.io/version: "v5.22.2" app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/component: operator diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamanifests.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamanifests.grafana.integreatly.org.yaml index 3bd97971b..ba74c70d2 100644 --- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamanifests.grafana.integreatly.org.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamanifests.grafana.integreatly.org.yaml @@ -227,7 +227,7 @@ spec: type: object x-kubernetes-validations: - message: namespace is immutable - rule: (!(has(oldSelf.namespace) && !has(self.namespace))) + rule: ((!has(oldSelf.__namespace__) && !has(self.__namespace__)) || (has(oldSelf.__namespace__) && has(self.__namespace__))) spec: x-kubernetes-preserve-unknown-fields: true required: diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicies.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicies.grafana.integreatly.org.yaml index ad1e6c5ee..f4cddb9a6 100644 --- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicies.grafana.integreatly.org.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicies.grafana.integreatly.org.yaml @@ -237,7 +237,7 @@ spec: type: object x-kubernetes-validations: - message: continue is invalid on the top level route node - rule: '!has(self.continue)' + rule: '!has(self.__continue__)' - message: match_re is invalid on the top level route node rule: '!has(self.match_re)' - message: matchers is invalid on the top level route node diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanas.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanas.grafana.integreatly.org.yaml index bafcef524..a902c26e4 100644 --- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanas.grafana.integreatly.org.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanas.grafana.integreatly.org.yaml @@ -5730,6 +5730,8 @@ spec: x-kubernetes-validations: - message: May specify either httpRouteFilterRequestRedirect or httpRouteFilterRequestRewrite, but not both rule: '!(self.exists(f, f.type == ''RequestRedirect'') && self.exists(f, f.type == ''URLRewrite''))' + - message: CORS filter cannot be repeated + rule: self.filter(f, f.type == 'CORS').size() <= 1 - message: RequestHeaderModifier filter cannot be repeated rule: self.filter(f, f.type == 'RequestHeaderModifier').size() <= 1 - message: ResponseHeaderModifier filter cannot be repeated @@ -7199,6 +7201,8 @@ spec: x-kubernetes-validations: - message: May specify either httpRouteFilterRequestRedirect or httpRouteFilterRequestRewrite, but not both rule: '!(self.exists(f, f.type == ''RequestRedirect'') && self.exists(f, f.type == ''URLRewrite''))' + - message: CORS filter cannot be repeated + rule: self.filter(f, f.type == 'CORS').size() <= 1 - message: RequestHeaderModifier filter cannot be repeated rule: self.filter(f, f.type == 'RequestHeaderModifier').size() <= 1 - message: ResponseHeaderModifier filter cannot be repeated diff --git a/clusters/cl01tl/manifests/grafana-operator/Deployment-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/Deployment-grafana-operator.yaml index 248ad6a57..984bb1cac 100644 --- a/clusters/cl01tl/manifests/grafana-operator/Deployment-grafana-operator.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/Deployment-grafana-operator.yaml @@ -4,10 +4,10 @@ metadata: name: grafana-operator namespace: grafana-operator labels: - helm.sh/chart: grafana-operator-5.22.1 + helm.sh/chart: grafana-operator-5.22.2 app.kubernetes.io/name: grafana-operator app.kubernetes.io/instance: grafana-operator - app.kubernetes.io/version: "v5.22.1" + app.kubernetes.io/version: "v5.22.2" app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/component: operator @@ -20,10 +20,10 @@ spec: template: metadata: labels: - helm.sh/chart: grafana-operator-5.22.1 + helm.sh/chart: grafana-operator-5.22.2 app.kubernetes.io/name: grafana-operator app.kubernetes.io/instance: grafana-operator - app.kubernetes.io/version: "v5.22.1" + app.kubernetes.io/version: "v5.22.2" app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/component: operator @@ -38,7 +38,7 @@ spec: - ALL readOnlyRootFilesystem: true runAsNonRoot: true - image: "ghcr.io/grafana/grafana-operator:v5.22.1" + image: "ghcr.io/grafana/grafana-operator:v5.22.2" imagePullPolicy: IfNotPresent env: - name: WATCH_NAMESPACE diff --git a/clusters/cl01tl/manifests/grafana-operator/Role-grafana-operator-leases.yaml b/clusters/cl01tl/manifests/grafana-operator/Role-grafana-operator-leases.yaml index afefca68d..b6c4214ec 100644 --- a/clusters/cl01tl/manifests/grafana-operator/Role-grafana-operator-leases.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/Role-grafana-operator-leases.yaml @@ -4,10 +4,10 @@ metadata: namespace: grafana-operator name: grafana-operator-leases labels: - helm.sh/chart: grafana-operator-5.22.1 + helm.sh/chart: grafana-operator-5.22.2 app.kubernetes.io/name: grafana-operator app.kubernetes.io/instance: grafana-operator - app.kubernetes.io/version: "v5.22.1" + app.kubernetes.io/version: "v5.22.2" app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/component: operator diff --git a/clusters/cl01tl/manifests/grafana-operator/RoleBinding-grafana-operator-leases.yaml b/clusters/cl01tl/manifests/grafana-operator/RoleBinding-grafana-operator-leases.yaml index d7d4af92b..6450172ae 100644 --- a/clusters/cl01tl/manifests/grafana-operator/RoleBinding-grafana-operator-leases.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/RoleBinding-grafana-operator-leases.yaml @@ -4,10 +4,10 @@ metadata: name: grafana-operator-leases namespace: grafana-operator labels: - helm.sh/chart: grafana-operator-5.22.1 + helm.sh/chart: grafana-operator-5.22.2 app.kubernetes.io/name: grafana-operator app.kubernetes.io/instance: grafana-operator - app.kubernetes.io/version: "v5.22.1" + app.kubernetes.io/version: "v5.22.2" app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/component: operator diff --git a/clusters/cl01tl/manifests/grafana-operator/Service-grafana-operator-metrics-service.yaml b/clusters/cl01tl/manifests/grafana-operator/Service-grafana-operator-metrics-service.yaml index e733693a6..eac84adb0 100644 --- a/clusters/cl01tl/manifests/grafana-operator/Service-grafana-operator-metrics-service.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/Service-grafana-operator-metrics-service.yaml @@ -4,10 +4,10 @@ metadata: name: grafana-operator-metrics-service namespace: grafana-operator labels: - helm.sh/chart: grafana-operator-5.22.1 + helm.sh/chart: grafana-operator-5.22.2 app.kubernetes.io/name: grafana-operator app.kubernetes.io/instance: grafana-operator - app.kubernetes.io/version: "v5.22.1" + app.kubernetes.io/version: "v5.22.2" app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/component: operator diff --git a/clusters/cl01tl/manifests/grafana-operator/ServiceAccount-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ServiceAccount-grafana-operator.yaml index ba8411b5c..84a30f910 100644 --- a/clusters/cl01tl/manifests/grafana-operator/ServiceAccount-grafana-operator.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/ServiceAccount-grafana-operator.yaml @@ -4,10 +4,10 @@ metadata: name: grafana-operator namespace: grafana-operator labels: - helm.sh/chart: grafana-operator-5.22.1 + helm.sh/chart: grafana-operator-5.22.2 app.kubernetes.io/name: grafana-operator app.kubernetes.io/instance: grafana-operator - app.kubernetes.io/version: "v5.22.1" + app.kubernetes.io/version: "v5.22.2" app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/component: operator diff --git a/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-grafana-operator.yaml index ec9dda5b0..8f787822b 100644 --- a/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-grafana-operator.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-grafana-operator.yaml @@ -4,10 +4,10 @@ metadata: name: grafana-operator namespace: grafana-operator labels: - helm.sh/chart: grafana-operator-5.22.1 + helm.sh/chart: grafana-operator-5.22.2 app.kubernetes.io/name: grafana-operator app.kubernetes.io/instance: grafana-operator - app.kubernetes.io/version: "v5.22.1" + app.kubernetes.io/version: "v5.22.2" app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/component: operator