prepare 4.5.0 (#787)

* prepare 4.5.0 * update the PREPARE_RELEASE info
grafana · Jul 12, 2022 · 9c54a39 · 9c54a39
1 parent 0b033e7
commit 9c54a39
Show file tree

Hide file tree

Showing 13 changed files with 6,171 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # Current Operator version
-VERSION ?= test
+VERSION ?= 4.5.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/PREPARE_RELEASE.md b/PREPARE_RELEASE.md
@@ -19,6 +19,7 @@ There is a lot of information on what is needed to manage OLM [compatible operat
       # 2021-11-22T10:34:12Z is enough
 - Run `make bundle`
 - Run `make bundle-kustomization KUSTOMIZE_TAG=v4.0.2` the KUSTOMIZE_TAG should match the new tag
+- Update `deploy/manifests/latest/deployment.yaml` so it matches with the new image version
 - 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
@@ -6,8 +6,8 @@ metadata:
     capabilities: Basic Install
     categories: Monitoring
     certified: "False"
-    containerImage: quay.io/grafana-operator/grafana-operator:v4.4.1
-    createdAt: "2022-05-09T10:00:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.5.0
+    createdAt: "2022-07-13T10: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.4.1
+  name: grafana-operator.v4.5.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.4.1
+                image: quay.io/grafana-operator/grafana-operator:v4.5.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -355,5 +355,5 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: grafana-operator.v4.4.0
-  version: 4.4.1
+  replaces: grafana-operator.v4.4.1
+  version: 4.5.0
diff --git a/bundle/manifests/integreatly.org_grafanadashboards.yaml b/bundle/manifests/integreatly.org_grafanadashboards.yaml
@@ -35,7 +35,8 @@ spec:
             description: GrafanaDashboardSpec defines the desired state of GrafanaDashboard
             properties:
               configMapRef:
-                description: Selects a key from a ConfigMap.
+                description: ConfigMapRef is a reference to a ConfigMap data field
+                  containing the dashboard's JSON
                 properties:
                   key:
                     description: The key to select.
@@ -51,6 +52,14 @@ spec:
                 required:
                 - key
                 type: object
+              contentCacheDuration:
+                description: ContentCacheDuration sets how often the operator should
+                  resync with the external source when using the `grafanaCom.id` or
+                  `url` field to specify the source of the dashboard. The default
+                  value is decided by the `dashboardContentCacheDuration` field in
+                  the `Grafana` resource. The default is 0 which is interpreted as
+                  never refetching.
+                type: string
               customFolderName:
                 type: string
               datasources:
@@ -74,7 +83,31 @@ spec:
                 required:
                 - id
                 type: object
+              gzipConfigMapRef:
+                description: GzipConfigMapRef is a reference to a ConfigMap binaryData
+                  field containing the dashboard's JSON, compressed with Gzip.
+                properties:
+                  key:
+                    description: The key to select.
+                    type: string
+                  name:
+                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      TODO: Add other useful fields. apiVersion, kind, uid?'
+                    type: string
+                  optional:
+                    description: Specify whether the ConfigMap or its key must be
+                      defined
+                    type: boolean
+                required:
+                - key
+                type: object
+              gzipJson:
+                description: GzipJson the dashboard's JSON compressed with Gzip. Base64-encoded
+                  when in YAML.
+                format: byte
+                type: string
               json:
+                description: Json is the dashboard's JSON
                 type: string
               jsonnet:
                 type: string
@@ -95,6 +128,26 @@ spec:
                 type: string
             type: object
           status:
+            properties:
+              content:
+                type: string
+              contentTimestamp:
+                format: date-time
+                type: string
+              contentUrl:
+                type: string
+              error:
+                properties:
+                  code:
+                    type: integer
+                  error:
+                    type: string
+                  retries:
+                    type: integer
+                required:
+                - code
+                - error
+                type: object
             type: object
         type: object
     served: true

diff --git a/bundle/manifests/integreatly.org_grafanas.yaml b/bundle/manifests/integreatly.org_grafanas.yaml
@@ -182,6 +182,12 @@ spec:
                         type: boolean
                       scopes:
                         type: string
+                      team_ids:
+                        type: string
+                      team_ids_attribute_path:
+                        type: string
+                      teams_url:
+                        type: string
                       tls_client_ca:
                         type: string
                       tls_client_cert:
@@ -1831,6 +1837,11 @@ spec:
                   - name
                   type: object
                 type: array
+              dashboardContentCacheDuration:
+                description: DashboardContentCacheDuration sets a default for when
+                  a `GrafanaDashboard` resource doesn't specify a `contentCacheDuration`.
+                  If left unset or 0 the default behavior is to cache indefinitely.
+                type: string
               dashboardLabelSelector:
                 items:
                   description: A label selector is a label query over a set of resources.
@@ -4402,6 +4413,8 @@ spec:
                     properties:
                       enabled:
                         type: boolean
+                      noProxy:
+                        type: string
                       secureUrl:
                         type: string
                       url:

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.4.1
+  newTag: v4.5.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.4.1
-    createdAt: "2022-05-09T10:00:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.5.0
+    createdAt: "2022-07-13T10: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.4.0
+  replaces: grafana-operator.v4.4.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.4.1
+        image: quay.io/grafana-operator/grafana-operator:v4.5.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet: