Prepare 4.9.0 (#894)

grafana · Feb 10, 2023 · d6de4e2 · d6de4e2
1 parent 40afe02
commit d6de4e2
Show file tree

Hide file tree

Showing 12 changed files with 7,005 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # Current Operator version
-VERSION ?= 4.8.0
+VERSION ?= 4.9.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.8.0
-    createdAt: "2022-12-01T10:00:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.9.0
+    createdAt: "2023-02-10T10: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.8.0
+  name: grafana-operator.v4.9.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -295,7 +295,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/grafana-operator/grafana-operator:v4.8.0
+                image: quay.io/grafana-operator/grafana-operator:v4.9.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -378,5 +378,5 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: grafana-operator.v4.7.1
-  version: 4.8.0
+  replaces: grafana-operator.v4.8.0
+  version: 4.9.0
diff --git a/bundle/manifests/integreatly.org_grafanas.yaml b/bundle/manifests/integreatly.org_grafanas.yaml
@@ -158,7 +158,6 @@ spec:
                   auth.generic_oauth:
                     properties:
                       allow_sign_up:
-                        nullable: true
                         type: boolean
                       allowed_domains:
                         type: string
@@ -175,6 +174,9 @@ spec:
                       enabled:
                         nullable: true
                         type: boolean
+                      name:
+                        nullable: true
+                        type: string
                       role_attribute_path:
                         type: string
                       role_attribute_strict:
@@ -200,7 +202,6 @@ spec:
                       token_url:
                         type: string
                       use_pkce:
-                        nullable: true
                         type: boolean
                     type: object
                   auth.github:
@@ -230,6 +231,9 @@ spec:
                     type: object
                   auth.gitlab:
                     properties:
+                      allow_assign_grafana_admin:
+                        nullable: true
+                        type: boolean
                       allow_sign_up:
                         nullable: true
                         type: boolean
@@ -246,6 +250,11 @@ spec:
                       enabled:
                         nullable: true
                         type: boolean
+                      role_attribute_path:
+                        type: string
+                      role_attribute_strict:
+                        nullable: true
+                        type: boolean
                       scopes:
                         type: string
                       token_url:
@@ -271,6 +280,41 @@ spec:
                       token_url:
                         type: string
                     type: object
+                  auth.jwt:
+                    properties:
+                      allow_assign_grafana_admin:
+                        type: boolean
+                      auto_sign_up:
+                        type: boolean
+                      cache_ttl:
+                        type: string
+                      email_claim:
+                        type: string
+                      enable_login_token:
+                        type: boolean
+                      enabled:
+                        type: boolean
+                      expect_claims:
+                        type: string
+                      header_name:
+                        type: string
+                      jwk_set_file:
+                        type: string
+                      jwk_set_url:
+                        type: string
+                      key_file:
+                        type: string
+                      role_attribute_path:
+                        type: string
+                      role_attribute_strict:
+                        type: boolean
+                      skip_org_role_sync:
+                        type: boolean
+                      url_login:
+                        type: boolean
+                      username_claim:
+                        type: string
+                    type: object
                   auth.ldap:
                     properties:
                       allow_sign_up:
@@ -388,6 +432,10 @@ spec:
                     properties:
                       default_home_dashboard_path:
                         type: string
+                      min_refresh_interval:
+                        description: Prevents users from setting the dashboard refresh
+                          interval to a lower value than a given interval value
+                        type: string
                       versions_to_keep:
                         nullable: true
                         type: integer
@@ -435,15 +483,33 @@ spec:
                     type: object
                   dataproxy:
                     properties:
+                      dialTimeout:
+                        type: integer
+                      expect_continue_timeout_seconds:
+                        type: integer
+                      idle_conn_timeout_seconds:
+                        type: integer
+                      keep_alive_seconds:
+                        type: integer
                       logging:
                         nullable: true
                         type: boolean
+                      max_conns_per_host:
+                        type: integer
+                      max_idle_connections:
+                        type: integer
+                      response_limit:
+                        type: integer
+                      row_limit:
+                        type: integer
                       send_user_header:
                         nullable: true
                         type: boolean
                       timeout:
                         nullable: true
                         type: integer
+                      tls_handshake_timeout_seconds:
+                        type: integer
                     type: object
                   external_image_storage:
                     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.8.0
+  newTag: v4.9.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.8.0
-    createdAt: "2022-12-01T10:00:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.9.0
+    createdAt: "2023-02-10T10: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.7.1
+  replaces: grafana-operator.v4.8.0
   version: 0.0.0
diff --git a/deploy/manifests/latest/crds.yaml b/deploy/manifests/latest/crds.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.6.2
+  creationTimestamp: null
   name: grafanadashboards.integreatly.org
 spec:
   group: integreatly.org
@@ -167,6 +168,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.6.2
+  creationTimestamp: null
   name: grafanadatasources.integreatly.org
 spec:
   group: integreatly.org
@@ -746,6 +748,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.6.2
+  creationTimestamp: null
   name: grafanas.integreatly.org
 spec:
   group: integreatly.org

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.8.0
+        image: quay.io/grafana-operator/grafana-operator:v4.9.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet: