Prepare 4.10.0 (#916)

* Prepare 4.10.0 * Update golangci-lint to 1.51.2 * Update golang.org/x/net to 0.8.0 This to solve CVE-2022-41723
grafana · Mar 13, 2023 · 8bed473 · 8bed473
1 parent a33ef1d
commit 8bed473
Show file tree

Hide file tree

Showing 14 changed files with 6,952 additions and 27 deletions.
diff --git a/.github/workflows/pr-validation.yaml b/.github/workflows/pr-validation.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2.5.2
         with:
-          version: "v1.46.2"
+          version: "v1.51.2"
           only-new-issues: true
 
   fmt:

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # Current Operator version
-VERSION ?= 4.9.0
+VERSION ?= 4.10.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
@@ -129,7 +129,7 @@ kustomize:
 # Download kustomize locally if necessary
 GOLANGCI = $(shell pwd)/bin/golangci-lint
 golangci:
-	$(call go-get-tool,$(GOLANGCI),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2)
+	$(call go-get-tool,$(GOLANGCI),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2)
 
 # go-get-tool will 'go install' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

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.9.0
-    createdAt: "2023-02-10T10:00:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.10.0
+    createdAt: "2023-03-14T10: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.9.0
+  name: grafana-operator.v4.10.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.9.0
+                image: quay.io/grafana-operator/grafana-operator:v4.10.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -378,5 +378,5 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  replaces: grafana-operator.v4.8.0
-  version: 4.9.0
+  replaces: grafana-operator.v4.9.0
+  version: 4.10.0
diff --git a/bundle/manifests/integreatly.org_grafanas.yaml b/bundle/manifests/integreatly.org_grafanas.yaml
@@ -5598,6 +5598,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  appProtocol:
+                    type: string
                   clusterIP:
                     type: string
                   labels:

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.9.0
+  newTag: v4.10.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.9.0
-    createdAt: "2023-02-10T10:00:12Z"
+    containerImage: quay.io/grafana-operator/grafana-operator:v4.10.0
+    createdAt: "2023-03-14T10: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.8.0
+  replaces: grafana-operator.v4.9.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.9.0
+        image: quay.io/grafana-operator/grafana-operator:v4.10.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet: