Skip to content

Commit 3a012ee

Browse files
author
Edvin N
authored
Prepare release of v4.0.2 (#616)
* Prepare release of v4.0.2 * Readd arch labels to clusterserviceversion This way make bundle will work in the future * Manually set operator-sdk to v1.13.1
1 parent a1fdf15 commit 3a012ee

6 files changed

+28
-6
lines changed

Makefile

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
operatorframework.io/arch.amd64: supported
1111
operatorframework.io/arch.arm64: supported
1212
operatorframework.io/arch.s390x: supported
13-
name: grafana-operator.v4.0.1
13+
name: grafana-operator.v4.0.2
1414
namespace: placeholder
1515
spec:
1616
apiservicedefinitions: {}
@@ -261,7 +261,7 @@ spec:
261261
valueFrom:
262262
fieldRef:
263263
fieldPath: metadata.annotations['olm.targetNamespaces']
264-
image: quay.io/grafana-operator/grafana-operator:v4.0.1
264+
image: quay.io/grafana-operator/grafana-operator:v4.0.2
265265
imagePullPolicy: Always
266266
livenessProbe:
267267
httpGet:
@@ -345,4 +345,4 @@ spec:
345345
provider:
346346
name: Red Hat
347347
replaces: grafana-operator.v4.0.0
348-
version: 4.0.1
348+
version: 4.0.2

bundle/manifests/integreatly.org_grafanadatasources.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,19 @@ spec:
170170
type: string
171171
postgresVersion:
172172
type: integer
173+
sigV4AssumeRoleArn:
174+
type: string
175+
sigV4Auth:
176+
description: Fields for AWS Prometheus data sources
177+
type: boolean
178+
sigV4AuthType:
179+
type: string
180+
sigV4ExternalId:
181+
type: string
182+
sigV4Profile:
183+
type: string
184+
sigV4Region:
185+
type: string
173186
sslmode:
174187
type: string
175188
subscriptionId:
@@ -270,6 +283,11 @@ spec:
270283
type: string
271284
secretKey:
272285
type: string
286+
sigV4AccessKey:
287+
description: Fields for AWS data sources
288+
type: string
289+
sigV4SecretKey:
290+
type: string
273291
tlsCACert:
274292
type: string
275293
tlsClientCert:

config/manager/kustomization.yaml

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

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

+4
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ metadata:
8585
}
8686
]
8787
capabilities: Basic Install
88+
labels:
89+
operatorframework.io/arch.amd64: supported
90+
operatorframework.io/arch.arm64: supported
91+
operatorframework.io/arch.s390x: supported
8892
name: grafana-operator.v0.0.0
8993
namespace: placeholder
9094
spec:

version/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package version
22

33
var (
4-
Version = "4.0.1"
4+
Version = "4.0.2"
55
)

0 commit comments

Comments
 (0)