Automated Manifest Update - Automerge #3074

Merged
gitea-bot merged 1 commits from auto/update-manifests-automerge-20260106220405 into manifests 2026-01-06 22:04:42 +00:00
17 changed files with 48 additions and 33 deletions

View File

@@ -3,10 +3,10 @@ kind: ClusterRole
metadata: metadata:
name: grafana-operator name: grafana-operator
labels: 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/name: grafana-operator
app.kubernetes.io/instance: 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/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator app.kubernetes.io/component: operator

View File

@@ -3,10 +3,10 @@ kind: ClusterRoleBinding
metadata: metadata:
name: grafana-operator name: grafana-operator
labels: 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/name: grafana-operator
app.kubernetes.io/instance: 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/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator app.kubernetes.io/component: operator

View File

@@ -278,7 +278,7 @@ spec:
description: The most recent observed state of a Grafana resource description: The most recent observed state of a Grafana resource
properties: properties:
conditions: conditions:
description: Results when synchonizing resource with Grafana instances description: Results when synchronizing resource with Grafana instances
items: items:
description: Condition contains details for one aspect of the current state of this API Resource. description: Condition contains details for one aspect of the current state of this API Resource.
properties: properties:

View File

@@ -308,7 +308,7 @@ spec:
description: The most recent observed state of a Grafana resource description: The most recent observed state of a Grafana resource
properties: properties:
conditions: conditions:
description: Results when synchonizing resource with Grafana instances description: Results when synchronizing resource with Grafana instances
items: items:
description: Condition contains details for one aspect of the current state of this API Resource. description: Condition contains details for one aspect of the current state of this API Resource.
properties: properties:

View File

@@ -404,7 +404,7 @@ spec:
description: The dashboard instanceSelector can't find matching grafana instances description: The dashboard instanceSelector can't find matching grafana instances
type: boolean type: boolean
conditions: conditions:
description: Results when synchonizing resource with Grafana instances description: Results when synchronizing resource with Grafana instances
items: items:
description: Condition contains details for one aspect of the current state of this API Resource. description: Condition contains details for one aspect of the current state of this API Resource.
properties: properties:

View File

@@ -250,7 +250,7 @@ spec:
description: The datasource instanceSelector can't find matching grafana instances description: The datasource instanceSelector can't find matching grafana instances
type: boolean type: boolean
conditions: conditions:
description: Results when synchonizing resource with Grafana instances description: Results when synchronizing resource with Grafana instances
items: items:
description: Condition contains details for one aspect of the current state of this API Resource. description: Condition contains details for one aspect of the current state of this API Resource.
properties: properties:

View File

@@ -146,7 +146,7 @@ spec:
description: The folder instanceSelector can't find matching grafana instances description: The folder instanceSelector can't find matching grafana instances
type: boolean type: boolean
conditions: conditions:
description: Results when synchonizing resource with Grafana instances description: Results when synchronizing resource with Grafana instances
items: items:
description: Condition contains details for one aspect of the current state of this API Resource. description: Condition contains details for one aspect of the current state of this API Resource.
properties: properties:

View File

@@ -393,7 +393,7 @@ spec:
description: GrafanaLibraryPanelStatus defines the observed state of GrafanaLibraryPanel description: GrafanaLibraryPanelStatus defines the observed state of GrafanaLibraryPanel
properties: properties:
conditions: conditions:
description: Results when synchonizing resource with Grafana instances description: Results when synchronizing resource with Grafana instances
items: items:
description: Condition contains details for one aspect of the current state of this API Resource. description: Condition contains details for one aspect of the current state of this API Resource.
properties: properties:

View File

@@ -181,7 +181,7 @@ spec:
description: The most recent observed state of a Grafana resource description: The most recent observed state of a Grafana resource
properties: properties:
conditions: conditions:
description: Results when synchonizing resource with Grafana instances description: Results when synchronizing resource with Grafana instances
items: items:
description: Condition contains details for one aspect of the current state of this API Resource. description: Condition contains details for one aspect of the current state of this API Resource.
properties: properties:

View File

@@ -113,11 +113,12 @@ spec:
description: Routes for alerts to match against description: Routes for alerts to match against
properties: properties:
active_time_intervals: active_time_intervals:
description: 'Deprecated: Never worked on the top level route node'
items: items:
type: string type: string
type: array type: array
continue: continue:
description: continue description: 'Deprecated: Never worked on the top level route node'
type: boolean type: boolean
group_by: group_by:
description: group by description: group by
@@ -133,10 +134,10 @@ spec:
match_re: match_re:
additionalProperties: additionalProperties:
type: string type: string
description: match re description: 'Deprecated: Never worked on the top level route node'
type: object type: object
matchers: matchers:
description: matchers description: 'Deprecated: Never worked on the top level route node'
items: items:
properties: properties:
isEqual: isEqual:
@@ -157,12 +158,12 @@ spec:
type: object type: object
type: array type: array
mute_time_intervals: mute_time_intervals:
description: mute time intervals description: 'Deprecated: Never worked on the top level route node'
items: items:
type: string type: string
type: array type: array
object_matchers: object_matchers:
description: object matchers description: 'Deprecated: Never worked on the top level route node'
items: items:
description: |- description: |-
ObjectMatcher ObjectMatcher is a matcher that can be used to filter alerts. ObjectMatcher ObjectMatcher is a matcher that can be used to filter alerts.
@@ -173,7 +174,7 @@ spec:
type: array type: array
type: array type: array
provenance: provenance:
description: provenance description: 'Deprecated: Does nothing'
type: string type: string
receiver: receiver:
description: receiver description: receiver
@@ -234,6 +235,19 @@ spec:
required: required:
- receiver - receiver
type: object 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: suspend:
description: Suspend pauses synchronizing attempts and tells the operator to ignore changes description: Suspend pauses synchronizing attempts and tells the operator to ignore changes
type: boolean type: boolean
@@ -250,7 +264,7 @@ spec:
description: GrafanaNotificationPolicyStatus defines the observed state of GrafanaNotificationPolicy description: GrafanaNotificationPolicyStatus defines the observed state of GrafanaNotificationPolicy
properties: properties:
conditions: conditions:
description: Results when synchonizing resource with Grafana instances description: Results when synchronizing resource with Grafana instances
items: items:
description: Condition contains details for one aspect of the current state of this API Resource. description: Condition contains details for one aspect of the current state of this API Resource.
properties: properties:

View File

@@ -41,6 +41,7 @@ spec:
description: GrafanaNotificationPolicyRouteSpec defines the desired state of GrafanaNotificationPolicyRoute description: GrafanaNotificationPolicyRouteSpec defines the desired state of GrafanaNotificationPolicyRoute
properties: properties:
active_time_intervals: active_time_intervals:
description: active time intervals
items: items:
type: string type: string
type: array type: array
@@ -101,7 +102,7 @@ spec:
type: array type: array
type: array type: array
provenance: provenance:
description: provenance description: 'Deprecated: Does nothing'
type: string type: string
receiver: receiver:
description: receiver description: receiver
@@ -166,7 +167,7 @@ spec:
description: The most recent observed state of a Grafana resource description: The most recent observed state of a Grafana resource
properties: properties:
conditions: conditions:
description: Results when synchonizing resource with Grafana instances description: Results when synchronizing resource with Grafana instances
items: items:
description: Condition contains details for one aspect of the current state of this API Resource. description: Condition contains details for one aspect of the current state of this API Resource.
properties: properties:

View File

@@ -131,7 +131,7 @@ spec:
description: The most recent observed state of a Grafana resource description: The most recent observed state of a Grafana resource
properties: properties:
conditions: conditions:
description: Results when synchonizing resource with Grafana instances description: Results when synchronizing resource with Grafana instances
items: items:
description: Condition contains details for one aspect of the current state of this API Resource. description: Condition contains details for one aspect of the current state of this API Resource.
properties: properties:

View File

@@ -172,7 +172,7 @@ spec:
- role - role
type: object type: object
conditions: conditions:
description: Results when synchonizing resource with Grafana instances description: Results when synchronizing resource with Grafana instances
items: items:
description: Condition contains details for one aspect of the current state of this API Resource. description: Condition contains details for one aspect of the current state of this API Resource.
properties: properties:

View File

@@ -4,10 +4,10 @@ metadata:
name: grafana-operator name: grafana-operator
namespace: grafana-operator namespace: grafana-operator
labels: 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/name: grafana-operator
app.kubernetes.io/instance: 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/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator app.kubernetes.io/component: operator
@@ -20,10 +20,10 @@ spec:
template: template:
metadata: metadata:
labels: 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/name: grafana-operator
app.kubernetes.io/instance: 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/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator app.kubernetes.io/component: operator
@@ -38,7 +38,7 @@ spec:
- ALL - ALL
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
runAsNonRoot: true runAsNonRoot: true
image: "ghcr.io/grafana/grafana-operator:v5.21.3" image: "ghcr.io/grafana/grafana-operator:v5.21.4"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: WATCH_NAMESPACE - name: WATCH_NAMESPACE

View File

@@ -4,10 +4,10 @@ metadata:
name: grafana-operator-metrics-service name: grafana-operator-metrics-service
namespace: grafana-operator namespace: grafana-operator
labels: 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/name: grafana-operator
app.kubernetes.io/instance: 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/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator app.kubernetes.io/component: operator

View File

@@ -4,10 +4,10 @@ metadata:
name: grafana-operator name: grafana-operator
namespace: grafana-operator namespace: grafana-operator
labels: 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/name: grafana-operator
app.kubernetes.io/instance: 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/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator app.kubernetes.io/component: operator

View File

@@ -4,10 +4,10 @@ metadata:
name: grafana-operator name: grafana-operator
namespace: grafana-operator namespace: grafana-operator
labels: 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/name: grafana-operator
app.kubernetes.io/instance: 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/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator app.kubernetes.io/component: operator