Prepare 5.1.0 (#1152)

grafana · Jul 10, 2023 · 394b8ec · 394b8ec
1 parent 473df6e
commit 394b8ec
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 # NOTE: this section almost matches outputs out kubebuilder v3.7.0
 ###
 # Current Operator version
-VERSION ?= 5.0.2
+VERSION ?= 5.1.0
 
 # Image URL to use all building/pushing image targets
 REGISTRY ?= ghcr.io

diff --git a/PREPARE_RELEASE.md b/PREPARE_RELEASE.md
@@ -4,17 +4,14 @@ In this repo you will need to perform the following tasks manually
 
 ## Documentation
 
-Currently our documentation needs to be updated in two spots.
-
-You need to change the version in [hugo/config.toml](hugo/config.toml).
-You also need to change the version for helm in [deploy/helm/grafana-operator/Chart.yaml](deploy/helm/grafana-operator/Chart.yaml).
-After that you need to run `make helm/docs` which will generate the changes to become visible on our homepage.
+Currently we only need to bump the hugo version and this is done in [hugo/config.toml](hugo/config.toml).
 
 ## OLM
 
 There is a lot of information on what is needed to manage OLM [compatible operators](https://redhat-connect.gitbook.io/certified-operator-guide/ocp-deployment/operator-metadata/creating-the-csv).
 
-- Update the `Makefile`
+- Update the `Makefile` version
+- `make generate`, `make manifests` & `make bundle`)
 - Update `containerImage` field in `config/manifests/bases/grafana-operator.clusterserviceversion.yaml`
 - Update `replaces` field in `config/manifests/bases/grafana-operator.clusterserviceversion.yaml`
 - Update `CreatedAt` field in `config/manifests/bases/grafana-operator.clusterserviceversion.yaml`
@@ -27,9 +24,7 @@ There is a lot of information on what is needed to manage OLM [compatible operat
       "2023-11-22T10:34:12.173861869Z"
       # 2023-11-22T10:34:12Z is enough
 - Run `make bundle`
-- Update the helm [chart version](deploy/helm/grafana-operator/Chart.yaml) and app version (it's fixed in the release but it looks nice).
-  - Look if any rbac rules have been changed in the last release, if so verify that the rbac rules for the helm chart is correct. This should be done in those PRs but it don't hurt take an extra look.
-- Update the [Kustomization](deploy/base/deployment.yaml) `grafana container image`
+- `Helm` look if any rbac rules have been changed in the last release, if so verify that the rbac rules for the helm chart is correct. This should be done in those PRs but it don't hurt take an extra look.
 - Create a PR and get it merged
 - Create a new release with the new tag, make sure to compile release notes (github has an option to do this for you)
 

diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml
@@ -100,7 +100,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/grafana-operator/grafana-operator
     support: Community
-  name: grafana-operator.v5.0.2
+  name: grafana-operator.v5.1.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -326,7 +326,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: ghcr.io/grafana-operator/grafana-operator:v5.0.2
+                image: ghcr.io/grafana-operator/grafana-operator:v5.1.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -414,4 +414,4 @@ spec:
   provider:
     name: Red Hat
   replaces: grafana-operator.v5.0.1
-  version: 5.0.2
+  version: 5.1.0
diff --git a/bundle/manifests/grafana.integreatly.org_grafanadashboards.yaml b/bundle/manifests/grafana.integreatly.org_grafanadashboards.yaml
@@ -53,6 +53,70 @@ spec:
                   - inputName
                   type: object
                 type: array
+              envFrom:
+                items:
+                  properties:
+                    configMapKeyRef:
+                      properties:
+                        key:
+                          type: string
+                        name:
+                          type: string
+                        optional:
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    secretKeyRef:
+                      properties:
+                        key:
+                          type: string
+                        name:
+                          type: string
+                        optional:
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                  type: object
+                type: array
+              envs:
+                items:
+                  properties:
+                    configMapKeyRef:
+                      properties:
+                        key:
+                          type: string
+                        name:
+                          type: string
+                        optional:
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    name:
+                      type: string
+                    secretKeyRef:
+                      properties:
+                        key:
+                          type: string
+                        name:
+                          type: string
+                        optional:
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    value:omitempty:
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
               folder:
                 type: string
               grafanaCom:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: ghcr.io/grafana-operator/grafana-operator
-  newTag: v5.0.2
+  newTag: v5.1.0
diff --git a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml
@@ -5,8 +5,8 @@ metadata:
     alm-examples: '[]'
     capabilities: Basic Install
     categories: Monitoring
-    containerImage: ghcr.io/grafana-operator/grafana-operator:v5.0.2
-    createdAt: "2023-06-09T00:00:00Z"
+    containerImage: ghcr.io/grafana-operator/grafana-operator:v5.1.0
+    createdAt: "2023-07-10T10:00:00Z"
     repository: https://github.com/grafana-operator/grafana-operator
     support: Community
   name: grafana-operator.v0.0.0
@@ -64,5 +64,5 @@ spec:
   minKubeVersion: 1.23.0
   provider:
     name: Red Hat
-  replaces: grafana-operator.v5.0.1
+  replaces: grafana-operator.v5.0.2
   version: 0.0.0
diff --git a/hugo/config.toml b/hugo/config.toml
@@ -59,7 +59,7 @@ archived_version = false
 # The version number for the version of the docs represented in this doc set.
 # Used in the "version-banner" partial to display a version number for the
 # current doc set.
-version = "v5.0.0"
+version = "v5.1.0"
 
 # A link to latest version of the docs. Used in the "version-banner" partial to
 # point people to the main doc site.