chore: Update manifests after change

This commit is contained in:
2025-12-18 02:27:38 +00:00
parent 6cb42fc918
commit 7b0ba8c8c1
18 changed files with 3318 additions and 84 deletions

View File

@@ -3,10 +3,10 @@ kind: ClusterRole
metadata:
name: grafana-operator
labels:
helm.sh/chart: grafana-operator-v5.20.0
helm.sh/chart: grafana-operator-5.21.1
app.kubernetes.io/name: grafana-operator
app.kubernetes.io/instance: grafana-operator
app.kubernetes.io/version: "v5.20.0"
app.kubernetes.io/version: "v5.21.1"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator
@@ -62,20 +62,9 @@ rules:
- update
- watch
- apiGroups:
- grafana.integreatly.org
- gateway.networking.k8s.io
resources:
- grafanaalertrulegroups
- grafanacontactpoints
- grafanadashboards
- grafanadatasources
- grafanafolders
- grafanalibrarypanels
- grafanamutetimings
- grafananotificationpolicies
- grafananotificationpolicyroutes
- grafananotificationtemplates
- grafanas
- grafanaserviceaccounts
- httproutes
verbs:
- create
- delete
@@ -87,35 +76,16 @@ rules:
- apiGroups:
- grafana.integreatly.org
resources:
- grafanaalertrulegroups/finalizers
- grafanacontactpoints/finalizers
- grafanadashboards/finalizers
- grafanadatasources/finalizers
- grafanafolders/finalizers
- grafanalibrarypanels/finalizers
- grafanamutetimings/finalizers
- grafananotificationpolicies/finalizers
- grafananotificationpolicyroutes/finalizers
- grafananotificationtemplates/finalizers
- grafanas/finalizers
- grafanaserviceaccounts/finalizers
- '*'
verbs:
- update
- get
- list
- patch
- watch
- apiGroups:
- grafana.integreatly.org
resources:
- grafanaalertrulegroups/status
- grafanacontactpoints/status
- grafanadashboards/status
- grafanadatasources/status
- grafanafolders/status
- grafanalibrarypanels/status
- grafanamutetimings/status
- grafananotificationpolicies/status
- grafananotificationpolicyroutes/status
- grafananotificationtemplates/status
- grafanas/status
- grafanaserviceaccounts/status
- '*/status'
verbs:
- get
- patch

View File

@@ -3,10 +3,10 @@ kind: ClusterRoleBinding
metadata:
name: grafana-operator
labels:
helm.sh/chart: grafana-operator-v5.20.0
helm.sh/chart: grafana-operator-5.21.1
app.kubernetes.io/name: grafana-operator
app.kubernetes.io/instance: grafana-operator
app.kubernetes.io/version: "v5.20.0"
app.kubernetes.io/version: "v5.21.1"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: grafanaalertrulegroups.grafana.integreatly.org
spec:
group: grafana.integreatly.org
@@ -127,7 +127,6 @@ spec:
description: Name of the alert rule group. If not specified, the resource name will be used.
type: string
resyncPeriod:
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if not set
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
@@ -181,8 +180,7 @@ spec:
type: string
for:
default: 0s
format: duration
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
pattern: ^([0-9]+(\.[0-9]+)?(s|m|h|d|w))+$
type: string
isPaused:
type: boolean

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: grafanacontactpoints.grafana.integreatly.org
spec:
group: grafana.integreatly.org
@@ -53,7 +53,16 @@ spec:
description: Allow the Operator to match this resource with Grafanas outside the current namespace
type: boolean
disableResolveMessage:
description: |-
Deprecated: define the receiver under .spec.receivers[]
Will be removed in a later version
type: boolean
editable:
description: Whether to enable or disable editing of the contact point in Grafana UI
type: boolean
x-kubernetes-validations:
- message: spec.editable is immutable
rule: self == oldSelf
instanceSelector:
description: Selects Grafana instances for import
properties:
@@ -102,22 +111,119 @@ spec:
- message: spec.instanceSelector is immutable
rule: self == oldSelf
name:
description: |-
Receivers are grouped under the same ContactPoint using the Name
Defaults to the name of the CR
type: string
x-kubernetes-validations:
- message: spec.name is immutable
rule: self == oldSelf
receivers:
description: List of receivers that Grafana will fan out notifications to
items:
description: Represents an integration to external services that receive Grafana notifications
properties:
disableResolveMessage:
type: boolean
settings:
x-kubernetes-preserve-unknown-fields: true
type:
minLength: 1
type: string
uid:
description: Manually specify the UID the Contact Point is created with. Can be any string consisting of alphanumeric characters, - and _ with a maximum length of 40
maxLength: 40
pattern: ^[a-zA-Z0-9-_]+$
type: string
valuesFrom:
items:
properties:
targetPath:
type: string
valueFrom:
properties:
configMapKeyRef:
description: Selects a key of a ConfigMap.
properties:
key:
description: The key to select.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
type: string
optional:
description: Specify whether the ConfigMap or its key must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
description: Selects a key of a Secret.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
x-kubernetes-validations:
- message: Either configMapKeyRef or secretKeyRef must be set
rule: (has(self.configMapKeyRef) && !has(self.secretKeyRef)) || (!has(self.configMapKeyRef) && has(self.secretKeyRef))
required:
- targetPath
- valueFrom
type: object
maxItems: 99
type: array
required:
- settings
- type
type: object
maxItems: 99
type: array
resyncPeriod:
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if not set
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
settings:
description: |-
Deprecated: define the receiver under .spec.receivers[]
Will be removed in a later version
x-kubernetes-preserve-unknown-fields: true
suspend:
description: Suspend pauses synchronizing attempts and tells the operator to ignore changes
type: boolean
type:
description: |-
Deprecated: define the receiver under .spec.receivers[]
Will be removed in a later version
minLength: 1
type: string
uid:
description: Manually specify the UID the Contact Point is created with. Can be any string consisting of alphanumeric characters, - and _ with a maximum length of 40
description: |-
Deprecated: define the receiver under .spec.receivers[]
Manually specify the UID the Contact Point is created with. Can be any string consisting of alphanumeric characters, - and _ with a maximum length of 40
maxLength: 40
pattern: ^[a-zA-Z0-9-_]+$
type: string
@@ -125,6 +231,9 @@ spec:
- message: spec.uid is immutable
rule: self == oldSelf
valuesFrom:
description: |-
Deprecated: define the receiver under .spec.receivers[]
Will be removed in a later version
items:
properties:
targetPath:
@@ -187,13 +296,12 @@ spec:
type: array
required:
- instanceSelector
- name
- settings
- type
type: object
x-kubernetes-validations:
- message: spec.uid is immutable
rule: ((!has(oldSelf.uid) && !has(self.uid)) || (has(oldSelf.uid) && has(self.uid)))
- message: spec.name is immutable
rule: ((!has(oldSelf.name) && !has(self.name)) || (has(oldSelf.name) && has(self.name)))
- message: spec.editable is immutable
rule: ((!has(oldSelf.editable) && !has(self.editable)) || (has(oldSelf.editable) && has(self.editable)))
- message: disabling spec.allowCrossNamespaceImport requires a recreate to ensure desired state
rule: '!oldSelf.allowCrossNamespaceImport || (oldSelf.allowCrossNamespaceImport && self.allowCrossNamespaceImport)'
status:

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: grafanadashboards.grafana.integreatly.org
spec:
group: grafana.integreatly.org
@@ -315,7 +315,6 @@ spec:
type: object
type: array
resyncPeriod:
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if not set
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: grafanadatasources.grafana.integreatly.org
spec:
group: grafana.integreatly.org
@@ -155,7 +155,6 @@ spec:
type: object
type: array
resyncPeriod:
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if not set
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: grafanafolders.grafana.integreatly.org
spec:
group: grafana.integreatly.org
@@ -112,7 +112,6 @@ spec:
description: Raw json with folder permissions, potentially exported from Grafana
type: string
resyncPeriod:
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if not set
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: grafanalibrarypanels.grafana.integreatly.org
spec:
group: grafana.integreatly.org
@@ -309,7 +309,6 @@ spec:
type: object
type: array
resyncPeriod:
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if not set
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: grafanamutetimings.grafana.integreatly.org
spec:
group: grafana.integreatly.org
@@ -110,7 +110,6 @@ spec:
description: A unique name for the mute timing
type: string
resyncPeriod:
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if not set
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: grafananotificationpolicies.grafana.integreatly.org
spec:
group: grafana.integreatly.org
@@ -106,13 +106,16 @@ spec:
- message: spec.instanceSelector is immutable
rule: self == oldSelf
resyncPeriod:
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if not set
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
route:
description: Routes for alerts to match against
properties:
active_time_intervals:
items:
type: string
type: array
continue:
description: continue
type: boolean

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: grafananotificationpolicyroutes.grafana.integreatly.org
spec:
group: grafana.integreatly.org
@@ -40,6 +40,10 @@ spec:
spec:
description: GrafanaNotificationPolicyRouteSpec defines the desired state of GrafanaNotificationPolicyRoute
properties:
active_time_intervals:
items:
type: string
type: array
continue:
description: continue
type: boolean

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: grafananotificationtemplates.grafana.integreatly.org
spec:
group: grafana.integreatly.org
@@ -109,7 +109,6 @@ spec:
description: Template name
type: string
resyncPeriod:
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if not set
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: grafanaserviceaccounts.grafana.integreatly.org
spec:
group: grafana.integreatly.org
@@ -67,7 +67,6 @@ spec:
- message: spec.name is immutable
rule: self == oldSelf
resyncPeriod:
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if not set
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string

View File

@@ -4,10 +4,10 @@ metadata:
name: grafana-operator
namespace: grafana-operator
labels:
helm.sh/chart: grafana-operator-v5.20.0
helm.sh/chart: grafana-operator-5.21.1
app.kubernetes.io/name: grafana-operator
app.kubernetes.io/instance: grafana-operator
app.kubernetes.io/version: "v5.20.0"
app.kubernetes.io/version: "v5.21.1"
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-v5.20.0
helm.sh/chart: grafana-operator-5.21.1
app.kubernetes.io/name: grafana-operator
app.kubernetes.io/instance: grafana-operator
app.kubernetes.io/version: "v5.20.0"
app.kubernetes.io/version: "v5.21.1"
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.20.0"
image: "ghcr.io/ghcr.io/grafana/grafana-operator:v5.21.1"
imagePullPolicy: IfNotPresent
env:
- name: WATCH_NAMESPACE
@@ -58,11 +58,15 @@ spec:
- --zap-encoder=console
- --zap-log-level=info
- --zap-time-encoding=rfc3339
- --default-resync-period=10m
- --leader-elect
- --max-concurrent-reconciles=1
volumeMounts:
- name: dashboards-dir
mountPath: /tmp/dashboards
- name: kubeauth-token-volume
mountPath: /var/run/secrets/grafana.com/serviceaccount
readOnly: true
ports:
- containerPort: 9090
name: metrics
@@ -85,3 +89,10 @@ spec:
volumes:
- name: dashboards-dir
emptyDir: {}
- name: kubeauth-token-volume
projected:
sources:
- serviceAccountToken:
audience: operator.grafana.com
expirationSeconds: 3600
path: token

View File

@@ -4,10 +4,10 @@ metadata:
name: grafana-operator-metrics-service
namespace: grafana-operator
labels:
helm.sh/chart: grafana-operator-v5.20.0
helm.sh/chart: grafana-operator-5.21.1
app.kubernetes.io/name: grafana-operator
app.kubernetes.io/instance: grafana-operator
app.kubernetes.io/version: "v5.20.0"
app.kubernetes.io/version: "v5.21.1"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator

View File

@@ -4,10 +4,10 @@ metadata:
name: grafana-operator
namespace: grafana-operator
labels:
helm.sh/chart: grafana-operator-v5.20.0
helm.sh/chart: grafana-operator-5.21.1
app.kubernetes.io/name: grafana-operator
app.kubernetes.io/instance: grafana-operator
app.kubernetes.io/version: "v5.20.0"
app.kubernetes.io/version: "v5.21.1"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator

View File

@@ -4,10 +4,10 @@ metadata:
name: grafana-operator
namespace: grafana-operator
labels:
helm.sh/chart: grafana-operator-v5.20.0
helm.sh/chart: grafana-operator-5.21.1
app.kubernetes.io/name: grafana-operator
app.kubernetes.io/instance: grafana-operator
app.kubernetes.io/version: "v5.20.0"
app.kubernetes.io/version: "v5.21.1"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: grafana-operator
app.kubernetes.io/component: operator