Skip to content

Commit 47d81ec

Browse files
committed
make olm CI pass
1 parent e537d52 commit 47d81ec

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

bundle/manifests/grafana-operator.clusterserviceversion.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ metadata:
9595
capabilities: Basic Install
9696
categories: Monitoring
9797
containerImage: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752
98-
createdAt: "2024-01-22T07:16:13Z"
98+
createdAt: "2024-01-22T12:06:14Z"
9999
operators.operatorframework.io/builder: operator-sdk-v1.32.0
100100
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
101101
repository: https://github.com/grafana/grafana-operator
102102
support: Grafana Labs
103-
name: grafana-operator.v5.6.0
103+
name: grafana-operator.v5.6.1
104104
namespace: placeholder
105105
spec:
106106
apiservicedefinitions: {}
@@ -332,7 +332,7 @@ spec:
332332
valueFrom:
333333
fieldRef:
334334
fieldPath: metadata.annotations['olm.targetNamespaces']
335-
image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752
335+
image: ghcr.io/grafana/grafana-operator@sha256:49ed7bdbae0b9a43e31df2e8ad2baad07042cf098d3c5944c4ce96e20a296695
336336
imagePullPolicy: Always
337337
livenessProbe:
338338
httpGet:
@@ -421,11 +421,11 @@ spec:
421421
name: Grafana Labs
422422
url: https://grafana.com
423423
relatedImages:
424-
- image: docker.io/grafana/grafana@sha256:ff68ed4324e471ffa269aa5308cdcf12276ef2d5a660daea95db9d629a32a7d8
425-
name: grafana
426-
- image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752
424+
- image: ghcr.io/grafana/grafana-operator@sha256:49ed7bdbae0b9a43e31df2e8ad2baad07042cf098d3c5944c4ce96e20a296695
427425
name: manager
428426
- image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752
429427
name: grafana-operator-97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752-annotation
428+
- image: docker.io/grafana/grafana@sha256:ff68ed4324e471ffa269aa5308cdcf12276ef2d5a660daea95db9d629a32a7d8
429+
name: grafana
430430
replaces: grafana-operator.v5.5.2
431-
version: 5.6.0
431+
version: 5.6.1

bundle/metadata/properties.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
properties:
2+
- type: olm.maxOpenShiftVersion
3+
value:
4+
version: "4.60"

config/manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ configMapGenerator:
1515
images:
1616
- name: controller
1717
newName: ghcr.io/grafana/grafana-operator
18-
newTag: v5.6.0
18+
newTag: v5.6.1

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

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ metadata:
99
createdAt: "2023-12-11T09:21:22Z"
1010
repository: https://github.com/grafana/grafana-operator
1111
support: Grafana Labs
12-
olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "v4.60"}]'
1312
name: grafana-operator.v0.0.0
1413
namespace: placeholder
1514
spec:

0 commit comments

Comments
 (0)