From 20289a95a1b78070e89085f0aa168b96510c0bad Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Tue, 6 Jan 2026 22:04:28 +0000 Subject: [PATCH] chore: Update manifests after automerge --- .../ClusterRole-grafana-operator.yaml | 4 +-- .../ClusterRoleBinding-grafana-operator.yaml | 4 +-- ...ertrulegroups.grafana.integreatly.org.yaml | 2 +- ...contactpoints.grafana.integreatly.org.yaml | 2 +- ...anadashboards.grafana.integreatly.org.yaml | 2 +- ...nadatasources.grafana.integreatly.org.yaml | 2 +- ...rafanafolders.grafana.integreatly.org.yaml | 2 +- ...librarypanels.grafana.integreatly.org.yaml | 2 +- ...namutetimings.grafana.integreatly.org.yaml | 2 +- ...ationpolicies.grafana.integreatly.org.yaml | 28 ++++++++++++++----- ...npolicyroutes.grafana.integreatly.org.yaml | 5 ++-- ...tiontemplates.grafana.integreatly.org.yaml | 2 +- ...rviceaccounts.grafana.integreatly.org.yaml | 2 +- .../Deployment-grafana-operator.yaml | 10 +++---- ...vice-grafana-operator-metrics-service.yaml | 4 +-- .../ServiceAccount-grafana-operator.yaml | 4 +-- .../ServiceMonitor-grafana-operator.yaml | 4 +-- 17 files changed, 48 insertions(+), 33 deletions(-) diff --git a/clusters/cl01tl/manifests/grafana-operator/ClusterRole-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ClusterRole-grafana-operator.yaml index 0e6ce9265..bb434c457 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.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 diff --git a/clusters/cl01tl/manifests/grafana-operator/ClusterRoleBinding-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ClusterRoleBinding-grafana-operator.yaml index c8d0f261e..6d9d8dc67 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.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 diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaalertrulegroups.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaalertrulegroups.grafana.integreatly.org.yaml index e8a722bc3..781090513 100644 --- 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: diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanacontactpoints.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanacontactpoints.grafana.integreatly.org.yaml index 8fcf41d3c..83d052afd 100644 --- 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: diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadashboards.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadashboards.grafana.integreatly.org.yaml index a078500a9..a1553814c 100644 --- 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: diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadatasources.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanadatasources.grafana.integreatly.org.yaml index 4c0cd7ea9..409e7bf2b 100644 --- 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: diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanafolders.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanafolders.grafana.integreatly.org.yaml index e0d53567f..2a4bf5f76 100644 --- 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: diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanalibrarypanels.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanalibrarypanels.grafana.integreatly.org.yaml index 910fb1b29..9a7558085 100644 --- 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: diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamutetimings.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanamutetimings.grafana.integreatly.org.yaml index 931634775..6077179a6 100644 --- 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: 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 bc7384c95..2b5bf36f7 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 @@ -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: diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicyroutes.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationpolicyroutes.grafana.integreatly.org.yaml index f86d40db2..afd7222c4 100644 --- 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: diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationtemplates.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafananotificationtemplates.grafana.integreatly.org.yaml index ec8acf3e4..b43eca4a0 100644 --- 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: diff --git a/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaserviceaccounts.grafana.integreatly.org.yaml b/clusters/cl01tl/manifests/grafana-operator/CustomResourceDefinition-grafanaserviceaccounts.grafana.integreatly.org.yaml index 384bf7fb2..304f4c61a 100644 --- 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: diff --git a/clusters/cl01tl/manifests/grafana-operator/Deployment-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/Deployment-grafana-operator.yaml index 2ad3295df..57d330eff 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.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 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 0f5afec21..db8411d40 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.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 diff --git a/clusters/cl01tl/manifests/grafana-operator/ServiceAccount-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ServiceAccount-grafana-operator.yaml index 664b84e7e..afe0a1fbc 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.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 diff --git a/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-grafana-operator.yaml b/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-grafana-operator.yaml index 2e437875e..27530f7b1 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.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