Skip to content

Commit d6de4e2

Browse files
author
Edvin N
authored
Prepare 4.9.0 (#894)
1 parent 40afe02 commit d6de4e2

12 files changed

+7005
-15
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Current Operator version
2-
VERSION ?= 4.8.0
2+
VERSION ?= 4.9.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

‎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.8.0
10-
createdAt: "2022-12-01T10:00:12Z"
9+
containerImage: quay.io/grafana-operator/grafana-operator:v4.9.0
10+
createdAt: "2023-02-10T10: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.8.0
22+
name: grafana-operator.v4.9.0
2323
namespace: placeholder
2424
spec:
2525
apiservicedefinitions: {}
@@ -295,7 +295,7 @@ spec:
295295
valueFrom:
296296
fieldRef:
297297
fieldPath: metadata.annotations['olm.targetNamespaces']
298-
image: quay.io/grafana-operator/grafana-operator:v4.8.0
298+
image: quay.io/grafana-operator/grafana-operator:v4.9.0
299299
imagePullPolicy: Always
300300
livenessProbe:
301301
httpGet:
@@ -378,5 +378,5 @@ spec:
378378
maturity: alpha
379379
provider:
380380
name: Red Hat
381-
replaces: grafana-operator.v4.7.1
382-
version: 4.8.0
381+
replaces: grafana-operator.v4.8.0
382+
version: 4.9.0

‎bundle/manifests/integreatly.org_grafanas.yaml

+68-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ spec:
158158
auth.generic_oauth:
159159
properties:
160160
allow_sign_up:
161-
nullable: true
162161
type: boolean
163162
allowed_domains:
164163
type: string
@@ -175,6 +174,9 @@ spec:
175174
enabled:
176175
nullable: true
177176
type: boolean
177+
name:
178+
nullable: true
179+
type: string
178180
role_attribute_path:
179181
type: string
180182
role_attribute_strict:
@@ -200,7 +202,6 @@ spec:
200202
token_url:
201203
type: string
202204
use_pkce:
203-
nullable: true
204205
type: boolean
205206
type: object
206207
auth.github:
@@ -230,6 +231,9 @@ spec:
230231
type: object
231232
auth.gitlab:
232233
properties:
234+
allow_assign_grafana_admin:
235+
nullable: true
236+
type: boolean
233237
allow_sign_up:
234238
nullable: true
235239
type: boolean
@@ -246,6 +250,11 @@ spec:
246250
enabled:
247251
nullable: true
248252
type: boolean
253+
role_attribute_path:
254+
type: string
255+
role_attribute_strict:
256+
nullable: true
257+
type: boolean
249258
scopes:
250259
type: string
251260
token_url:
@@ -271,6 +280,41 @@ spec:
271280
token_url:
272281
type: string
273282
type: object
283+
auth.jwt:
284+
properties:
285+
allow_assign_grafana_admin:
286+
type: boolean
287+
auto_sign_up:
288+
type: boolean
289+
cache_ttl:
290+
type: string
291+
email_claim:
292+
type: string
293+
enable_login_token:
294+
type: boolean
295+
enabled:
296+
type: boolean
297+
expect_claims:
298+
type: string
299+
header_name:
300+
type: string
301+
jwk_set_file:
302+
type: string
303+
jwk_set_url:
304+
type: string
305+
key_file:
306+
type: string
307+
role_attribute_path:
308+
type: string
309+
role_attribute_strict:
310+
type: boolean
311+
skip_org_role_sync:
312+
type: boolean
313+
url_login:
314+
type: boolean
315+
username_claim:
316+
type: string
317+
type: object
274318
auth.ldap:
275319
properties:
276320
allow_sign_up:
@@ -388,6 +432,10 @@ spec:
388432
properties:
389433
default_home_dashboard_path:
390434
type: string
435+
min_refresh_interval:
436+
description: Prevents users from setting the dashboard refresh
437+
interval to a lower value than a given interval value
438+
type: string
391439
versions_to_keep:
392440
nullable: true
393441
type: integer
@@ -435,15 +483,33 @@ spec:
435483
type: object
436484
dataproxy:
437485
properties:
486+
dialTimeout:
487+
type: integer
488+
expect_continue_timeout_seconds:
489+
type: integer
490+
idle_conn_timeout_seconds:
491+
type: integer
492+
keep_alive_seconds:
493+
type: integer
438494
logging:
439495
nullable: true
440496
type: boolean
497+
max_conns_per_host:
498+
type: integer
499+
max_idle_connections:
500+
type: integer
501+
response_limit:
502+
type: integer
503+
row_limit:
504+
type: integer
441505
send_user_header:
442506
nullable: true
443507
type: boolean
444508
timeout:
445509
nullable: true
446510
type: integer
511+
tls_handshake_timeout_seconds:
512+
type: integer
447513
type: object
448514
external_image_storage:
449515
properties:

‎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.8.0
16+
newTag: v4.9.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.8.0
91-
createdAt: "2022-12-01T10:00:12Z"
90+
containerImage: quay.io/grafana-operator/grafana-operator:v4.9.0
91+
createdAt: "2023-02-10T10: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.7.1
171+
replaces: grafana-operator.v4.8.0
172172
version: 0.0.0

‎deploy/manifests/latest/crds.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.6.2
6+
creationTimestamp: null
67
name: grafanadashboards.integreatly.org
78
spec:
89
group: integreatly.org
@@ -167,6 +168,7 @@ kind: CustomResourceDefinition
167168
metadata:
168169
annotations:
169170
controller-gen.kubebuilder.io/version: v0.6.2
171+
creationTimestamp: null
170172
name: grafanadatasources.integreatly.org
171173
spec:
172174
group: integreatly.org
@@ -746,6 +748,7 @@ kind: CustomResourceDefinition
746748
metadata:
747749
annotations:
748750
controller-gen.kubebuilder.io/version: v0.6.2
751+
creationTimestamp: null
749752
name: grafanas.integreatly.org
750753
spec:
751754
group: integreatly.org

‎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.8.0
65+
image: quay.io/grafana-operator/grafana-operator:v4.9.0
6666
imagePullPolicy: Always
6767
livenessProbe:
6868
httpGet:

0 commit comments

Comments
 (0)