Merge pull request 'Automated Manifest Update - Automerge' (#4835) from auto/update-manifests-automerge-4834 into manifests

2026-03-18 10:06:45 +00:00
parent 2f043c6622 78afecce27
commit c678f6ac6b
11 changed files with 25 additions and 21 deletions
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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