chore: Update manifests after automerge

2026-01-06 22:04:28 +00:00
parent 6d7bae8972
commit 20289a95a1
17 changed files with 48 additions and 33 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.21.3
+    helm.sh/chart: grafana-operator-5.21.4
    app.kubernetes.io/name: grafana-operator
    app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.21.3"
+    app.kubernetes.io/version: "v5.21.4"
    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.21.3
+    helm.sh/chart: grafana-operator-5.21.4
    app.kubernetes.io/name: grafana-operator
    app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.21.3"
+    app.kubernetes.io/version: "v5.21.4"
    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-grafanaalertrulegroups.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaalertrulegroups.grafana.integreatly.org.yaml
@@ -278,7 +278,7 @@ spec:
              description: The most recent observed state of a Grafana resource
              properties:
                conditions:
-                  description: Results when synchonizing resource with Grafana instances
+                  description: Results when synchronizing resource with Grafana instances
                  items:
                    description: Condition contains details for one aspect of the current state of this API Resource.
                    properties:
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanacontactpoints.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanacontactpoints.grafana.integreatly.org.yaml
@@ -308,7 +308,7 @@ spec:
              description: The most recent observed state of a Grafana resource
              properties:
                conditions:
-                  description: Results when synchonizing resource with Grafana instances
+                  description: Results when synchronizing resource with Grafana instances
                  items:
                    description: Condition contains details for one aspect of the current state of this API Resource.
                    properties:
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadashboards.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadashboards.grafana.integreatly.org.yaml
@@ -404,7 +404,7 @@ spec:
                  description: The dashboard instanceSelector can't find matching grafana instances
                  type: boolean
                conditions:
-                  description: Results when synchonizing resource with Grafana instances
+                  description: Results when synchronizing resource with Grafana instances
                  items:
                    description: Condition contains details for one aspect of the current state of this API Resource.
                    properties:
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadatasources.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadatasources.grafana.integreatly.org.yaml
@@ -250,7 +250,7 @@ spec:
                  description: The datasource instanceSelector can't find matching grafana instances
                  type: boolean
                conditions:
-                  description: Results when synchonizing resource with Grafana instances
+                  description: Results when synchronizing resource with Grafana instances
                  items:
                    description: Condition contains details for one aspect of the current state of this API Resource.
                    properties:
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanafolders.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanafolders.grafana.integreatly.org.yaml
@@ -146,7 +146,7 @@ spec:
                  description: The folder instanceSelector can't find matching grafana instances
                  type: boolean
                conditions:
-                  description: Results when synchonizing resource with Grafana instances
+                  description: Results when synchronizing resource with Grafana instances
                  items:
                    description: Condition contains details for one aspect of the current state of this API Resource.
                    properties:
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanalibrarypanels.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanalibrarypanels.grafana.integreatly.org.yaml
@@ -393,7 +393,7 @@ spec:
              description: GrafanaLibraryPanelStatus defines the observed state of GrafanaLibraryPanel
              properties:
                conditions:
-                  description: Results when synchonizing resource with Grafana instances
+                  description: Results when synchronizing resource with Grafana instances
                  items:
                    description: Condition contains details for one aspect of the current state of this API Resource.
                    properties:
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamutetimings.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamutetimings.grafana.integreatly.org.yaml
@@ -181,7 +181,7 @@ spec:
              description: The most recent observed state of a Grafana resource
              properties:
                conditions:
-                  description: Results when synchonizing resource with Grafana instances
+                  description: Results when synchronizing resource with Grafana instances
                  items:
                    description: Condition contains details for one aspect of the current state of this API Resource.
                    properties:
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicies.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicies.grafana.integreatly.org.yaml
@@ -113,11 +113,12 @@ spec:
                  description: Routes for alerts to match against
                  properties:
                    active_time_intervals:
+                      description: 'Deprecated: Never worked on the top level route node'
                      items:
                        type: string
                      type: array
                    continue:
-                      description: continue
+                      description: 'Deprecated: Never worked on the top level route node'
                      type: boolean
                    group_by:
                      description: group by
@@ -133,10 +134,10 @@ spec:
                    match_re:
                      additionalProperties:
                        type: string
-                      description: match re
+                      description: 'Deprecated: Never worked on the top level route node'
                      type: object
                    matchers:
-                      description: matchers
+                      description: 'Deprecated: Never worked on the top level route node'
                      items:
                        properties:
                          isEqual:
@@ -157,12 +158,12 @@ spec:
                        type: object
                      type: array
                    mute_time_intervals:
-                      description: mute time intervals
+                      description: 'Deprecated: Never worked on the top level route node'
                      items:
                        type: string
                      type: array
                    object_matchers:
-                      description: object matchers
+                      description: 'Deprecated: Never worked on the top level route node'
                      items:
                        description: |-
                          ObjectMatcher ObjectMatcher is a matcher that can be used to filter alerts.
@@ -173,7 +174,7 @@ spec:
                        type: array
                      type: array
                    provenance:
-                      description: provenance
+                      description: 'Deprecated: Does nothing'
                      type: string
                    receiver:
                      description: receiver
@@ -234,6 +235,19 @@ spec:
                  required:
                    - receiver
                  type: object
+                  x-kubernetes-validations:
+                    - message: continue is invalid on the top level route node
+                      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
+                      rule: '!has(self.matchers)'
+                    - message: object_matchers is invalid on the top level route node
+                      rule: '!has(self.object_matchers)'
+                    - message: mute_time_intervals is invalid on the top level route node
+                      rule: '!has(self.mute_time_intervals)'
+                    - message: active_time_intervals is invalid on the top level route node
+                      rule: '!has(self.active_time_intervals)'
                suspend:
                  description: Suspend pauses synchronizing attempts and tells the operator to ignore changes
                  type: boolean
@@ -250,7 +264,7 @@ spec:
              description: GrafanaNotificationPolicyStatus defines the observed state of GrafanaNotificationPolicy
              properties:
                conditions:
-                  description: Results when synchonizing resource with Grafana instances
+                  description: Results when synchronizing resource with Grafana instances
                  items:
                    description: Condition contains details for one aspect of the current state of this API Resource.
                    properties:
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicyroutes.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicyroutes.grafana.integreatly.org.yaml
@@ -41,6 +41,7 @@ spec:
              description: GrafanaNotificationPolicyRouteSpec defines the desired state of GrafanaNotificationPolicyRoute
              properties:
                active_time_intervals:
+                  description: active time intervals
                  items:
                    type: string
                  type: array
@@ -101,7 +102,7 @@ spec:
                    type: array
                  type: array
                provenance:
-                  description: provenance
+                  description: 'Deprecated: Does nothing'
                  type: string
                receiver:
                  description: receiver
@@ -166,7 +167,7 @@ spec:
              description: The most recent observed state of a Grafana resource
              properties:
                conditions:
-                  description: Results when synchonizing resource with Grafana instances
+                  description: Results when synchronizing resource with Grafana instances
                  items:
                    description: Condition contains details for one aspect of the current state of this API Resource.
                    properties:
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationtemplates.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationtemplates.grafana.integreatly.org.yaml
@@ -131,7 +131,7 @@ spec:
              description: The most recent observed state of a Grafana resource
              properties:
                conditions:
-                  description: Results when synchonizing resource with Grafana instances
+                  description: Results when synchronizing resource with Grafana instances
                  items:
                    description: Condition contains details for one aspect of the current state of this API Resource.
                    properties:
--- a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaserviceaccounts.grafana.integreatly.org.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaserviceaccounts.grafana.integreatly.org.yaml
@@ -172,7 +172,7 @@ spec:
                    - role
                  type: object
                conditions:
-                  description: Results when synchonizing resource with Grafana instances
+                  description: Results when synchronizing resource with Grafana instances
                  items:
                    description: Condition contains details for one aspect of the current state of this API Resource.
                    properties:
--- 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.21.3
+    helm.sh/chart: grafana-operator-5.21.4
    app.kubernetes.io/name: grafana-operator
    app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.21.3"
+    app.kubernetes.io/version: "v5.21.4"
    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.21.3
+        helm.sh/chart: grafana-operator-5.21.4
        app.kubernetes.io/name: grafana-operator
        app.kubernetes.io/instance: grafana-operator
-        app.kubernetes.io/version: "v5.21.3"
+        app.kubernetes.io/version: "v5.21.4"
        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.21.3"
+          image: "ghcr.io/grafana/grafana-operator:v5.21.4"
          imagePullPolicy: IfNotPresent
          env:
            - name: WATCH_NAMESPACE
--- 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.21.3
+    helm.sh/chart: grafana-operator-5.21.4
    app.kubernetes.io/name: grafana-operator
    app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.21.3"
+    app.kubernetes.io/version: "v5.21.4"
    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.21.3
+    helm.sh/chart: grafana-operator-5.21.4
    app.kubernetes.io/name: grafana-operator
    app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.21.3"
+    app.kubernetes.io/version: "v5.21.4"
    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.21.3
+    helm.sh/chart: grafana-operator-5.21.4
    app.kubernetes.io/name: grafana-operator
    app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/version: "v5.21.3"
+    app.kubernetes.io/version: "v5.21.4"
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/part-of: grafana-operator
    app.kubernetes.io/component: operator