Prepare release v4.2.0 (#692)

* Prepare 4.2.0 * make bundle * Create kustomization 4.2.0 * Add deployment file in latest
grafana · Feb 22, 2022 · c3897e9 · c3897e9
1 parent ad3bb1a
commit c3897e9
Show file tree

Hide file tree

Showing 12 changed files with 6,046 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # Current Operator version
-VERSION ?= 4.1.1
+VERSION ?= 4.2.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.1.1
-    createdAt: "2021-12-16T10:34:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.2.0
+    createdAt: "2022-02-22T16: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
@@ -18,7 +18,7 @@ metadata:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.arm64: supported
     operatorframework.io/arch.s390x: supported
-  name: grafana-operator.v4.1.1
+  name: grafana-operator.v4.2.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -271,7 +271,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/grafana-operator/grafana-operator:v4.1.1
+                image: quay.io/grafana-operator/grafana-operator:v4.2.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -354,5 +354,5 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: grafana-operator.v4.1.0
-  version: 4.1.1
+  replaces: grafana-operator.v4.1.1
+  version: 4.2.0
diff --git a/bundle/manifests/integreatly.org_grafanadatasources.yaml b/bundle/manifests/integreatly.org_grafanadatasources.yaml
@@ -56,10 +56,14 @@ spec:
                         json options See https://grafana.com/docs/administration/provisioning/#datasources
                       properties:
                         addCorsHeader:
-                          description: ' Useful fields for clickhouse datasource  See
-                            https://github.com/Vertamedia/clickhouse-grafana/tree/master/dist/README.md#configure-the-datasource-with-provisioning  See
-                            https://github.com/Vertamedia/clickhouse-grafana/tree/master/src/datasource.ts#L44'
+                          description: Useful fields for clickhouse datasource See
+                            https://github.com/Vertamedia/clickhouse-grafana/tree/master/dist/README.md#configure-the-datasource-with-provisioning
+                            See https://github.com/Vertamedia/clickhouse-grafana/tree/master/src/datasource.ts#L44
                           type: boolean
+                        allowInfraExplore:
+                          type: boolean
+                        apiToken:
+                          type: string
                         appInsightsAppId:
                           description: Fields for Azure data sources
                           type: string
@@ -111,6 +115,19 @@ spec:
                           type: string
                         esVersion:
                           type: string
+                        exemplarTraceIdDestinations:
+                          items:
+                            properties:
+                              datasourceUid:
+                                type: string
+                              name:
+                                type: string
+                              url:
+                                type: string
+                              urlDisplayLabel:
+                                type: string
+                            type: object
+                          type: array
                         githubUrl:
                           description: Fields for Github data sources
                           type: string
@@ -185,6 +202,8 @@ spec:
                             datasourceUid:
                               type: string
                           type: object
+                        showOffline:
+                          type: boolean
                         sigV4AssumeRoleArn:
                           type: string
                         sigV4Auth:
@@ -243,8 +262,13 @@ spec:
                           type: string
                         tsdbVersion:
                           type: string
+                        url:
+                          description: Fields for Instana data sources See https://github.com/instana/instana-grafana-datasource/blob/main/provisioning/datasources/datasource.yml
+                          type: string
                         usePOST:
                           type: boolean
+                        useProxy:
+                          type: boolean
                         useYandexCloudAuthorization:
                           type: boolean
                         version:

diff --git a/bundle/manifests/integreatly.org_grafanas.yaml b/bundle/manifests/integreatly.org_grafanas.yaml
@@ -4402,6 +4402,8 @@ spec:
                     properties:
                       enabled:
                         type: boolean
+                      secureUrl:
+                        type: string
                       url:
                         type: string
                     required:

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.1.1
+  newTag: v4.2.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.0.2
-    createdAt: "2021-12-16T10:34:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.2.0
+    createdAt: "2022-02-22T16: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
@@ -167,5 +167,5 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: grafana-operator.v4.1.0
+  replaces: grafana-operator.v4.1.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.1.1
+        image: quay.io/grafana-operator/grafana-operator:v4.2.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet: