Skip to content

Commit 9c54a39

Browse files
author
Edvin N
authored
prepare 4.5.0 (grafana#787)
* prepare 4.5.0 * update the PREPARE_RELEASE info
1 parent 0b033e7 commit 9c54a39

13 files changed

+6171
-14
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Current Operator version
2-
VERSION ?= test
2+
VERSION ?= 4.5.0
33

44
# IMAGE_TAG_BASE defines the namespace and part of the image name for remote images.
55
# running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both

‎PREPARE_RELEASE.md

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ There is a lot of information on what is needed to manage OLM [compatible operat
1919
# 2021-11-22T10:34:12Z is enough
2020
- Run `make bundle`
2121
- Run `make bundle-kustomization KUSTOMIZE_TAG=v4.0.2` the KUSTOMIZE_TAG should match the new tag
22+
- Update `deploy/manifests/latest/deployment.yaml` so it matches with the new image version
2223
- Create a PR and get it merged
2324
- Create a new release with the new tag, make sure to compile release notes (github has an option to do this for you)
2425

‎bundle/manifests/grafana-operator.clusterserviceversion.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ metadata:
66
capabilities: Basic Install
77
categories: Monitoring
88
certified: "False"
9-
containerImage: quay.io/grafana-operator/grafana-operator:v4.4.1
10-
createdAt: "2022-05-09T10:00:12Z"
9+
containerImage: quay.io/grafana-operator/grafana-operator:v4.5.0
10+
createdAt: "2022-07-13T10:00:12Z"
1111
description: A Kubernetes Operator based on the Operator SDK for creating and
1212
managing Grafana instances
1313
operators.operatorframework.io/builder: operator-sdk-v1.13.1
@@ -19,7 +19,7 @@ metadata:
1919
operatorframework.io/arch.arm64: supported
2020
operatorframework.io/arch.ppc64le: supported
2121
operatorframework.io/arch.s390x: supported
22-
name: grafana-operator.v4.4.1
22+
name: grafana-operator.v4.5.0
2323
namespace: placeholder
2424
spec:
2525
apiservicedefinitions: {}
@@ -272,7 +272,7 @@ spec:
272272
valueFrom:
273273
fieldRef:
274274
fieldPath: metadata.annotations['olm.targetNamespaces']
275-
image: quay.io/grafana-operator/grafana-operator:v4.4.1
275+
image: quay.io/grafana-operator/grafana-operator:v4.5.0
276276
imagePullPolicy: Always
277277
livenessProbe:
278278
httpGet:
@@ -355,5 +355,5 @@ spec:
355355
maturity: alpha
356356
provider:
357357
name: Red Hat
358-
replaces: grafana-operator.v4.4.0
359-
version: 4.4.1
358+
replaces: grafana-operator.v4.4.1
359+
version: 4.5.0

‎bundle/manifests/integreatly.org_grafanadashboards.yaml

+54-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ spec:
3535
description: GrafanaDashboardSpec defines the desired state of GrafanaDashboard
3636
properties:
3737
configMapRef:
38-
description: Selects a key from a ConfigMap.
38+
description: ConfigMapRef is a reference to a ConfigMap data field
39+
containing the dashboard's JSON
3940
properties:
4041
key:
4142
description: The key to select.
@@ -51,6 +52,14 @@ spec:
5152
required:
5253
- key
5354
type: object
55+
contentCacheDuration:
56+
description: ContentCacheDuration sets how often the operator should
57+
resync with the external source when using the `grafanaCom.id` or
58+
`url` field to specify the source of the dashboard. The default
59+
value is decided by the `dashboardContentCacheDuration` field in
60+
the `Grafana` resource. The default is 0 which is interpreted as
61+
never refetching.
62+
type: string
5463
customFolderName:
5564
type: string
5665
datasources:
@@ -74,7 +83,31 @@ spec:
7483
required:
7584
- id
7685
type: object
86+
gzipConfigMapRef:
87+
description: GzipConfigMapRef is a reference to a ConfigMap binaryData
88+
field containing the dashboard's JSON, compressed with Gzip.
89+
properties:
90+
key:
91+
description: The key to select.
92+
type: string
93+
name:
94+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
95+
TODO: Add other useful fields. apiVersion, kind, uid?'
96+
type: string
97+
optional:
98+
description: Specify whether the ConfigMap or its key must be
99+
defined
100+
type: boolean
101+
required:
102+
- key
103+
type: object
104+
gzipJson:
105+
description: GzipJson the dashboard's JSON compressed with Gzip. Base64-encoded
106+
when in YAML.
107+
format: byte
108+
type: string
77109
json:
110+
description: Json is the dashboard's JSON
78111
type: string
79112
jsonnet:
80113
type: string
@@ -95,6 +128,26 @@ spec:
95128
type: string
96129
type: object
97130
status:
131+
properties:
132+
content:
133+
type: string
134+
contentTimestamp:
135+
format: date-time
136+
type: string
137+
contentUrl:
138+
type: string
139+
error:
140+
properties:
141+
code:
142+
type: integer
143+
error:
144+
type: string
145+
retries:
146+
type: integer
147+
required:
148+
- code
149+
- error
150+
type: object
98151
type: object
99152
type: object
100153
served: true

‎bundle/manifests/integreatly.org_grafanas.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,12 @@ spec:
182182
type: boolean
183183
scopes:
184184
type: string
185+
team_ids:
186+
type: string
187+
team_ids_attribute_path:
188+
type: string
189+
teams_url:
190+
type: string
185191
tls_client_ca:
186192
type: string
187193
tls_client_cert:
@@ -1831,6 +1837,11 @@ spec:
18311837
- name
18321838
type: object
18331839
type: array
1840+
dashboardContentCacheDuration:
1841+
description: DashboardContentCacheDuration sets a default for when
1842+
a `GrafanaDashboard` resource doesn't specify a `contentCacheDuration`.
1843+
If left unset or 0 the default behavior is to cache indefinitely.
1844+
type: string
18341845
dashboardLabelSelector:
18351846
items:
18361847
description: A label selector is a label query over a set of resources.
@@ -4402,6 +4413,8 @@ spec:
44024413
properties:
44034414
enabled:
44044415
type: boolean
4416+
noProxy:
4417+
type: string
44054418
secureUrl:
44064419
type: string
44074420
url:

‎config/manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ kind: Kustomization
1313
images:
1414
- name: controller
1515
newName: quay.io/grafana-operator/grafana-operator
16-
newTag: v4.4.1
16+
newTag: v4.5.0
1717

1818
# Protect the /metrics endpoint by putting it behind auth.
1919
# If you want your controller-manager to expose the /metrics

‎config/manifests/bases/grafana-operator.clusterserviceversion.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ metadata:
8787
capabilities: Basic Install
8888
categories: Monitoring
8989
certified: "False"
90-
containerImage: quay.io/grafana-operator/grafana-operator:v4.4.1
91-
createdAt: "2022-05-09T10:00:12Z"
90+
containerImage: quay.io/grafana-operator/grafana-operator:v4.5.0
91+
createdAt: "2022-07-13T10:00:12Z"
9292
description: A Kubernetes Operator based on the Operator SDK for creating and
9393
managing Grafana instances
9494
repository: https://github.com/grafana-operator/grafana-operator
@@ -168,5 +168,5 @@ spec:
168168
maturity: alpha
169169
provider:
170170
name: Red Hat
171-
replaces: grafana-operator.v4.4.0
171+
replaces: grafana-operator.v4.4.1
172172
version: 0.0.0

‎deploy/manifests/latest/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
valueFrom:
6363
fieldRef:
6464
fieldPath: metadata.namespace
65-
image: quay.io/grafana-operator/grafana-operator:v4.4.1
65+
image: quay.io/grafana-operator/grafana-operator:v4.5.0
6666
imagePullPolicy: Always
6767
livenessProbe:
6868
httpGet:

0 commit comments

Comments
 (0)