Prepare release v4.3.0 (grafana#734)

* Prepare 4.3.0 * Add kustomiaztion 4.3.0 * Update replaces to match new config * Update latest deployment to 4.3.0
addreas · Apr 27, 2022 · ebced34 · ebced34
1 parent 0b28b88
commit ebced34
Show file tree

Hide file tree

Showing 11 changed files with 6,056 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # Current Operator version
-VERSION ?= 4.2.0
+VERSION ?= 4.3.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,19 +6,20 @@ metadata:
     capabilities: Basic Install
     categories: Monitoring
     certified: "False"
-    containerImage: quay.io/grafana-operator/grafana-operator:v4.2.0
-    createdAt: "2022-02-22T16:00:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.3.0
+    createdAt: "2022-04-27T10: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
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/grafana-operator/grafana-operator
-    support: grafana-operator
+    support: Red Hat
   labels:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.arm64: supported
+    operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
-  name: grafana-operator.v4.2.0
+  name: grafana-operator.v4.3.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -271,7 +272,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/grafana-operator/grafana-operator:v4.2.0
+                image: quay.io/grafana-operator/grafana-operator:v4.3.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -354,5 +355,5 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: grafana-operator.v4.1.1
-  version: 4.2.0
+  replaces: grafana-operator.v4.2.0
+  version: 4.3.0
diff --git a/bundle/manifests/integreatly.org_grafanadatasources.yaml b/bundle/manifests/integreatly.org_grafanadatasources.yaml
@@ -60,6 +60,10 @@ spec:
                             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
+                        alertmanagerUid:
+                          description: AlertManagerUID if null use the internal grafana
+                            alertmanager
+                          type: string
                         allowInfraExplore:
                           type: boolean
                         apiToken:
@@ -174,6 +178,10 @@ spec:
                           type: string
                         logMessageField:
                           type: string
+                        manageAlerts:
+                          description: ManageAlerts turns on alert management from
+                            UI
+                          type: boolean
                         maxIdleConns:
                           type: integer
                         maxLines:
@@ -190,13 +198,18 @@ spec:
                           type: boolean
                         organization:
                           type: string
+                        port:
+                          type: integer
                         postgresVersion:
                           type: integer
                         search:
                           properties:
                             hide:
                               type: boolean
                           type: object
+                        server:
+                          description: Fields for Grafana Clickhouse data sources
+                          type: string
                         serviceMap:
                           properties:
                             datasourceUid:
@@ -229,6 +242,9 @@ spec:
                           type: string
                         timescaledb:
                           type: boolean
+                        timezone:
+                          description: Extra field for MySQL data source
+                          type: string
                         tlsAuth:
                           type: boolean
                         tlsAuthWithCACert:
@@ -271,6 +287,8 @@ spec:
                           type: boolean
                         useYandexCloudAuthorization:
                           type: boolean
+                        username:
+                          type: string
                         version:
                           type: string
                         xHeaderKey:

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.2.0
+  newTag: v4.3.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,17 +87,17 @@ metadata:
     capabilities: Basic Install
     categories: Monitoring
     certified: "False"
-    containerImage: quay.io/grafana-operator/grafana-operator:v4.2.0
-    createdAt: "2022-02-22T16:00:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.3.0
+    createdAt: "2022-04-27T10: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
     support: Red Hat
   labels:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.arm64: supported
-    operatorframework.io/arch.s390x: supported
     operatorframework.io/arch.ppc64le: supported
+    operatorframework.io/arch.s390x: supported
   name: grafana-operator.v0.0.0
   namespace: placeholder
 spec:
@@ -168,5 +168,5 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: grafana-operator.v4.1.1
+  replaces: grafana-operator.v4.2.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.2.0
+        image: quay.io/grafana-operator/grafana-operator:v4.3.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet: