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.

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

Prepare 4.7.0 #831

Merged
merged 1 commit into from Oct 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
@@ -1,5 +1,5 @@
# Current Operator version
VERSION ?= 4.6.0
VERSION ?= 4.7.0

# IMAGE_TAG_BASE defines the namespace and part of the image name for remote images.
# running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
Expand Down
35 changes: 29 additions & 6 deletions bundle/manifests/grafana-operator.clusterserviceversion.yaml
Expand Up @@ -6,8 +6,8 @@ metadata:
capabilities: Basic Install
categories: Monitoring
certified: "False"
containerImage: quay.io/grafana-operator/grafana-operator:v4.6.0
createdAt: "2022-08-18T12:00:12Z"
containerImage: quay.io/grafana-operator/grafana-operator:v4.7.0
createdAt: "2022-10-06T10:00:12Z"
description: A Kubernetes Operator based on the Operator SDK for creating and
managing Grafana instances
operators.operatorframework.io/builder: operator-sdk-v1.13.1
Expand All @@ -19,7 +19,7 @@ metadata:
operatorframework.io/arch.arm64: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
name: grafana-operator.v4.6.0
name: grafana-operator.v4.7.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand All @@ -33,6 +33,9 @@ spec:
- kind: GrafanaDataSource
name: grafanadatasources.integreatly.org
version: v1alpha1
- kind: GrafanaFolder
name: grafanafolders.integreatly.org
version: v1alpha1
- kind: GrafanaNotificationChannel
name: grafananotificationchannels.integreatly.org
version: v1alpha1
Expand Down Expand Up @@ -151,6 +154,26 @@ spec:
- get
- patch
- update
- apiGroups:
- integreatly.org
resources:
- grafanafolders
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- integreatly.org
resources:
- grafanafolders/status
verbs:
- get
- patch
- update
- apiGroups:
- integreatly.org
resources:
Expand Down Expand Up @@ -272,7 +295,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
image: quay.io/grafana-operator/grafana-operator:v4.6.0
image: quay.io/grafana-operator/grafana-operator:v4.7.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -355,5 +378,5 @@ spec:
maturity: alpha
provider:
name: Red Hat
replaces: grafana-operator.v4.5.1
version: 4.6.0
replaces: grafana-operator.v4.6.0
version: 4.7.0
4 changes: 4 additions & 0 deletions bundle/manifests/integreatly.org_grafanadatasources.yaml
Expand Up @@ -257,6 +257,10 @@ spec:
type: string
timeInterval:
type: string
timeout:
description: HTTP Request timeout in seconds. Overrides
dataproxy.timeout option
type: integer
timescaledb:
type: boolean
timezone:
Expand Down
7 changes: 6 additions & 1 deletion bundle/manifests/integreatly.org_grafanafolders.yaml
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: grafanafolders.integreatly.org
spec:
Expand Down Expand Up @@ -35,6 +35,9 @@ spec:
spec:
properties:
permissions:
description: FolderPermissions shall contain the _complete_ permissions
for the folder. Any permission not listed here, will be removed
from the folder.
items:
properties:
permissionLevel:
Expand All @@ -50,6 +53,8 @@ spec:
type: object
type: array
title:
description: FolderName is the display-name of the folder and must
match CustomFolderName of any GrafanaDashboard you want to put in
type: string
required:
- title
Expand Down
2 changes: 2 additions & 0 deletions bundle/manifests/integreatly.org_grafanas.yaml
Expand Up @@ -2123,6 +2123,8 @@ spec:
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
volumeName:
type: string
type: object
deployment:
description: GrafanaDeployment provides a means to configure the deployment
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Expand Up @@ -13,7 +13,7 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/grafana-operator/grafana-operator
newTag: v4.6.0
newTag: v4.7.0

# Protect the /metrics endpoint by putting it behind auth.
# If you want your controller-manager to expose the /metrics
Expand Down
Expand Up @@ -87,8 +87,8 @@ metadata:
capabilities: Basic Install
categories: Monitoring
certified: "False"
containerImage: quay.io/grafana-operator/grafana-operator:v4.6.0
createdAt: "2022-08-18T12:00:12Z"
containerImage: quay.io/grafana-operator/grafana-operator:v4.7.0
createdAt: "2022-10-06T10:00:12Z"
description: A Kubernetes Operator based on the Operator SDK for creating and
managing Grafana instances
repository: https://github.com/grafana-operator/grafana-operator
Expand Down Expand Up @@ -168,5 +168,5 @@ spec:
maturity: alpha
provider:
name: Red Hat
replaces: grafana-operator.v4.5.1
replaces: grafana-operator.v4.6.0
version: 0.0.0
2 changes: 1 addition & 1 deletion deploy/manifests/latest/deployment.yaml
Expand Up @@ -62,7 +62,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/grafana-operator/grafana-operator:v4.6.0
image: quay.io/grafana-operator/grafana-operator:v4.7.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down