Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bitnami/grafana-operator] Release 4.9.2 #31393

Merged
merged 3 commits into from
Jan 16, 2025
Merged

[bitnami/grafana-operator] Release 4.9.2 #31393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4017e88
[bitnami/grafana-operator] Release 4.9.2 updating components versions
bitnami-bot Jan 16, 2025
5146789
Update CHANGELOG.md
bitnami-bot Jan 16, 2025
cc0379e
Update CRDs automatically
bitnami-bot Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions bitnami/grafana-operator/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Changelog

## 4.9.1 (2025-01-12)
## 4.9.2 (2025-01-16)

* [bitnami/grafana-operator] Release 4.9.1 ([#31314](https://github.com/bitnami/charts/pull/31314))
* [bitnami/grafana-operator] Release 4.9.2 ([#31393](https://github.com/bitnami/charts/pull/31393))

## <small>4.9.1 (2025-01-12)</small>

* [bitnami/grafana-operator] Release 4.9.1 (#31314) ([cff5398](https://github.com/bitnami/charts/commit/cff53987779d2a3f4151564a27c25ba235fdc3c4)), closes [#31314](https://github.com/bitnami/charts/issues/31314)

## 4.9.0 (2024-12-10)

Expand Down
6 changes: 3 additions & 3 deletions bitnami/grafana-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ annotations:
- name: grafana
image: docker.io/bitnami/grafana:11.4.0-debian-12-r0
- name: grafana-operator
image: docker.io/bitnami/grafana-operator:5.15.1-debian-12-r4
image: docker.io/bitnami/grafana-operator:5.16.0-debian-12-r0
apiVersion: v2
appVersion: 5.15.1
appVersion: 5.16.0
dependencies:
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
Expand All @@ -30,4 +30,4 @@ maintainers:
name: grafana-operator
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/grafana-operator
version: 4.9.1
version: 4.9.2
31 changes: 23 additions & 8 deletions bitnami/grafana-operator/crds/grafanaalertrulegroups.integreatly.org.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Source: https://raw.githubusercontent.com/grafana/grafana-operator/v{version}/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanaalertrulegroups.yaml
# Version: 5.15.1
# Version: 5.16.0
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -45,6 +45,9 @@ spec:
description: GrafanaAlertRuleGroupSpec defines the desired state of GrafanaAlertRuleGroup
properties:
allowCrossNamespaceImport:
default: false
description: Allow the Operator to match this resource with Grafanas
outside the current namespace
type: boolean
editable:
description: Whether to enable or disable editing of the alert rule
Expand All @@ -62,7 +65,7 @@ spec:
Overrides the FolderSelector
type: string
instanceSelector:
description: selects Grafanas for import
description: Selects Grafana instances for import
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
Expand Down Expand Up @@ -108,7 +111,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
x-kubernetes-validations:
- message: Value is immutable
- message: spec.instanceSelector is immutable
rule: self == oldSelf
interval:
format: duration
Expand All @@ -119,7 +122,9 @@ spec:
name will be used.
type: string
resyncPeriod:
default: 10m
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if
not set
format: duration
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
Expand Down Expand Up @@ -241,11 +246,18 @@ spec:
- message: Only one of FolderUID or FolderRef can be set
rule: (has(self.folderUID) && !(has(self.folderRef))) || (has(self.folderRef)
&& !(has(self.folderUID)))
- 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:
description: GrafanaAlertRuleGroupStatus defines the observed state of
GrafanaAlertRuleGroup
description: The most recent observed state of a Grafana resource
properties:
conditions:
description: Results when synchonizing resource with Grafana instances
items:
description: Condition contains details for one aspect of the current
state of this API Resource.
Expand Down Expand Up @@ -301,8 +313,11 @@ spec:
- type
type: object
type: array
required:
- conditions
lastResync:
description: Last time the resource was synchronized with Grafana
instances
format: date-time
type: string
type: object
type: object
served: true
Expand Down
52 changes: 41 additions & 11 deletions bitnami/grafana-operator/crds/grafanacontactpoints.integreatly.org.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Source: https://raw.githubusercontent.com/grafana/grafana-operator/v{version}/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanacontactpoints.yaml
# Version: 5.15.1
# Version: 5.16.0
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand All @@ -18,7 +18,15 @@ spec:
singular: grafanacontactpoint
scope: Namespaced
versions:
- name: v1beta1
- additionalPrinterColumns:
- format: date-time
jsonPath: .status.lastResync
name: Last resync
type: date
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1beta1
schema:
openAPIV3Schema:
description: GrafanaContactPoint is the Schema for the grafanacontactpoints
Expand All @@ -45,11 +53,14 @@ spec:
description: GrafanaContactPointSpec defines the desired state of GrafanaContactPoint
properties:
allowCrossNamespaceImport:
default: false
description: Allow the Operator to match this resource with Grafanas
outside the current namespace
type: boolean
disableResolveMessage:
type: boolean
instanceSelector:
description: selects Grafanas for import
description: Selects Grafana instances for import
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
Expand Down Expand Up @@ -95,12 +106,14 @@ spec:
type: object
x-kubernetes-map-type: atomic
x-kubernetes-validations:
- message: Value is immutable
- message: spec.instanceSelector is immutable
rule: self == oldSelf
name:
type: string
resyncPeriod:
default: 10m
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if
not set
format: duration
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
Expand All @@ -126,11 +139,19 @@ spec:
- telegram
- threema
- victorops
- webex
- webhook
- wecom
- hipchat
- oncall
type: string
uid:
description: Manually specify the UID the Contact Point is created
with
type: string
x-kubernetes-validations:
- message: spec.uid is immutable
rule: self == oldSelf
valuesFrom:
items:
properties:
Expand Down Expand Up @@ -201,13 +222,19 @@ spec:
- name
- settings
type: object
x-kubernetes-validations:
- message: spec.uid is immutable
rule: ((!has(oldSelf.uid) && !has(self.uid)) || (has(oldSelf.uid) &&
has(self.uid)))
- message: disabling spec.allowCrossNamespaceImport requires a recreate
to ensure desired state
rule: '!oldSelf.allowCrossNamespaceImport || (oldSelf.allowCrossNamespaceImport
&& self.allowCrossNamespaceImport)'
status:
description: GrafanaContactPointStatus defines the observed state of GrafanaContactPoint
description: The most recent observed state of a Grafana resource
properties:
conditions:
description: |-
INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
Important: Run "make" to regenerate code after modifying this file
description: Results when synchonizing resource with Grafana instances
items:
description: Condition contains details for one aspect of the current
state of this API Resource.
Expand Down Expand Up @@ -263,8 +290,11 @@ spec:
- type
type: object
type: array
required:
- conditions
lastResync:
description: Last time the resource was synchronized with Grafana
instances
format: date-time
type: string
type: object
type: object
served: true
Expand Down
25 changes: 16 additions & 9 deletions bitnami/grafana-operator/crds/grafanadashboards.integreatly.org.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Source: https://raw.githubusercontent.com/grafana/grafana-operator/v{version}/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadashboards.yaml
# Version: 5.15.1
# Version: 5.16.0
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -55,8 +55,9 @@ spec:
description: GrafanaDashboardSpec defines the desired state of GrafanaDashboard
properties:
allowCrossNamespaceImport:
description: allow to import this resources from an operator in a
different namespace
default: false
description: Allow the Operator to match this resource with Grafanas
outside the current namespace
type: boolean
configMapRef:
description: dashboard from configmap
Expand Down Expand Up @@ -240,7 +241,7 @@ spec:
format: byte
type: string
instanceSelector:
description: selects Grafanas for import
description: Selects Grafana instances for import
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
Expand Down Expand Up @@ -286,7 +287,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
x-kubernetes-validations:
- message: Value is immutable
- message: spec.instanceSelector is immutable
rule: self == oldSelf
json:
description: dashboard json
Expand Down Expand Up @@ -324,9 +325,9 @@ spec:
type: object
type: array
resyncPeriod:
default: 5m
description: how often the dashboard is refreshed, defaults to 5m
if not set
default: 10m0s
description: How often the resource is synced, defaults to 10m0s if
not set
format: duration
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
Expand Down Expand Up @@ -410,6 +411,10 @@ spec:
- message: spec.uid is immutable
rule: ((!has(oldSelf.uid) && !has(self.uid)) || (has(oldSelf.uid) &&
has(self.uid)))
- message: disabling spec.allowCrossNamespaceImport requires a recreate
to ensure desired state
rule: '!oldSelf.allowCrossNamespaceImport || (oldSelf.allowCrossNamespaceImport
&& self.allowCrossNamespaceImport)'
status:
description: GrafanaDashboardStatus defines the observed state of GrafanaDashboard
properties:
Expand All @@ -418,6 +423,7 @@ spec:
instances
type: boolean
conditions:
description: Results when synchonizing resource with Grafana instances
items:
description: Condition contains details for one aspect of the current
state of this API Resource.
Expand Down Expand Up @@ -484,7 +490,8 @@ spec:
hash:
type: string
lastResync:
description: Last time the dashboard was resynced
description: Last time the resource was synchronized with Grafana
instances
format: date-time
type: string
uid:
Expand Down
Loading
Loading