Prepare 4.7.0 (#831)

grafana · Oct 6, 2022 · e40bcf5 · e40bcf5
1 parent f568ea8
commit e40bcf5
Show file tree

Hide file tree

Showing 13 changed files with 6,763 additions and 14 deletions.
diff --git a/Makefile b/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

diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml
@@ -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
@@ -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: {}
@@ -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
@@ -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:
@@ -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:
@@ -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
diff --git a/bundle/manifests/integreatly.org_grafanadatasources.yaml b/bundle/manifests/integreatly.org_grafanadatasources.yaml
@@ -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:

diff --git a/bundle/manifests/integreatly.org_grafanafolders.yaml b/bundle/manifests/integreatly.org_grafanafolders.yaml
@@ -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:
@@ -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:
@@ -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

diff --git a/bundle/manifests/integreatly.org_grafanas.yaml b/bundle/manifests/integreatly.org_grafanas.yaml
@@ -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

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -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

diff --git a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml
@@ -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
@@ -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
diff --git a/deploy/manifests/latest/deployment.yaml b/deploy/manifests/latest/deployment.yaml
@@ -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: