Prepare 4.6.0 (#815)

Use the new controller-gen, if you have a local bin downloaded by the makefile you will need to delete it. Else you will get build errors.
grafana · Aug 18, 2022 · a7d7fa5 · a7d7fa5
1 parent 8485b0f
commit a7d7fa5
Show file tree

Hide file tree

Showing 14 changed files with 6,677 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # Current Operator version
-VERSION ?= 4.5.1
+VERSION ?= 4.6.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.5.1
-    createdAt: "2022-07-22T16:00:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.6.0
+    createdAt: "2022-08-18T12: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.5.1
+  name: grafana-operator.v4.6.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -272,7 +272,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/grafana-operator/grafana-operator:v4.5.1
+                image: quay.io/grafana-operator/grafana-operator:v4.6.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -355,5 +355,5 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: grafana-operator.v4.4.1
-  version: 4.5.1
+  replaces: grafana-operator.v4.5.1
+  version: 4.6.0
diff --git a/bundle/manifests/integreatly.org_grafanadashboards.yaml b/bundle/manifests/integreatly.org_grafanadashboards.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: grafanadashboards.integreatly.org
 spec:

diff --git a/bundle/manifests/integreatly.org_grafanadatasources.yaml b/bundle/manifests/integreatly.org_grafanadatasources.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: grafanadatasources.integreatly.org
 spec:
@@ -45,6 +45,18 @@ spec:
                       type: string
                     basicAuthUser:
                       type: string
+                    customJsonData:
+                      description: CustomJsonData will be used in place of jsonData,
+                        if present, and supports arbitrary JSON, not just those of
+                        official datasources
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    customSecureJsonData:
+                      description: SecureCustomJsonData will be used in place of secureJsonData,
+                        if present, and supports arbitrary JSON, not just those of
+                        official datasources
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
                     database:
                       type: string
                     editable:
@@ -118,7 +130,10 @@ spec:
                         encrypt:
                           type: string
                         esVersion:
-                          type: string
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          x-kubernetes-int-or-string: true
                         exemplarTraceIdDestinations:
                           items:
                             properties:

diff --git a/bundle/manifests/integreatly.org_grafananotificationchannels.yaml b/bundle/manifests/integreatly.org_grafananotificationchannels.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: grafananotificationchannels.integreatly.org
 spec:

diff --git a/bundle/manifests/integreatly.org_grafanas.yaml b/bundle/manifests/integreatly.org_grafanas.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: grafanas.integreatly.org
 spec:
@@ -571,9 +571,35 @@ spec:
                     type: object
                   plugins:
                     properties:
+                      allow_loading_unsigned_plugins:
+                        description: Enter a comma-separated list of plugin identifiers
+                          to identify plugins to load even if they are unsigned. Plugins
+                          with modified signatures are never loaded. We do not recommend
+                          using this option. For more information, refer to https://grafana.com/docs/grafana/next/administration/plugin-management/#plugin-signatures
+                        type: string
                       enable_alpha:
+                        description: Set to true if you want to test alpha plugins
+                          that are not yet ready for general usage. Default is false.
+                        nullable: true
+                        type: boolean
+                      plugin_admin_enabled:
+                        description: Available to Grafana administrators only, enables
+                          installing / uninstalling / updating plugins directly from
+                          the Grafana UI. Set to true by default. Setting it to false
+                          will hide the install / uninstall / update controls. For
+                          more information, refer to https://grafana.com/docs/grafana/next/administration/plugin-management/#plugin-catalog
                         nullable: true
                         type: boolean
+                      plugin_catalog_hidden_plugins:
+                        description: Enter a comma-separated list of plugin identifiers
+                          to hide in the plugin catalog.
+                        type: string
+                      plugin_catalog_url:
+                        description: Custom install/learn more URL for enterprise
+                          plugins. Defaults to https://grafana.com/grafana/plugins/.
+                        type: string
+                    required:
+                    - plugin_admin_enabled
                     type: object
                   remote_cache:
                     properties:

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.5.1
+  newTag: v4.6.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.5.1
-    createdAt: "2022-07-22T16:00:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.6.0
+    createdAt: "2022-08-18T12: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.0
+  replaces: grafana-operator.v4.5.1
   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.5.1
+        image: quay.io/grafana-operator/grafana-operator:v4.6.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet: