Dependency updates for CVEs and such

.github/workflows/pr-validation.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.18"
+          go-version: "1.22"
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
@@ -29,7 +29,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.18"
+          go-version: "1.22"
       - name: Run fmt
         run: |
           make fmt
@@ -49,7 +49,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.18"
+          go-version: "1.22"
       - name: Run manifests
         run: |
           make manifests
@@ -69,7 +69,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.18"
+          go-version: "1.22"
       - name: Run api-docs
         run: |
           make api-docs
@@ -89,7 +89,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.18"
+          go-version: "1.22"
       - name: Run test
         shell: bash
         run: |
@@ -139,7 +139,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.18"
+          go-version: "1.22"
       - name: Prepare
         id: prep
         run: |

Dockerfile

@@ -1,6 +1,6 @@
-ARG BUILDER_IMAGE=golang:1.18
-ARG UBI_MINIMAL_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.1.0
-ARG UBI_MICRO_IMAGE=registry.access.redhat.com/ubi9/ubi-micro:9.1.0
+ARG BUILDER_IMAGE=golang:1.22-alpine
+ARG UBI_MINIMAL_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.4
+ARG UBI_MICRO_IMAGE=registry.access.redhat.com/ubi9/ubi-micro:9.4
 
 # Build the manager binary
 # hadolint ignore=DL3006

Jenkinsfile

@@ -6,7 +6,7 @@ pipeline {
     label 'ubuntu_20_04_label'
   }
   tools {
-    go "Go 1.20"
+    go "Go 1.22.4"
   }
   environment {
     PROJECT = "src/github.com/integr8ly/grafana-operator"

Makefile

@@ -25,8 +25,6 @@ KUSTOMIZE_TAG := $(if $(KUSTOMIZE_TAG),$(KUSTOMIZE_TAG),latest)
 
 # Image URL to use all building/pushing image targets8
 IMG ?= ${ORG}/${PROJECT}:${TAG}
-# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -86,7 +84,7 @@ undeploy:
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." object:headerFile=hack/boilerplate.go.txt output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) rbac:roleName=manager-role webhook paths="./..." object:headerFile=hack/boilerplate.go.txt crd output:crd:artifacts:config=config/crd/bases
 
 # Generate API reference documentation
 api-docs: gen-crd-api-reference-docs kustomize
@@ -127,7 +125,7 @@ docker-buildx: test
 # Download controller-gen locally if necessary
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen:
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2)
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
 
 # Download kustomize locally if necessary
 KUSTOMIZE = $(shell pwd)/bin/kustomize

config/crd/bases/integreatly.org_grafanadashboards.yaml

@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: grafanadashboards.integreatly.org
 spec:
   group: integreatly.org
@@ -22,14 +20,19 @@ spec:
         description: GrafanaDashboard is the Schema for the grafanadashboards API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
@@ -44,8 +47,10 @@ spec:
                     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?'
+                    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
@@ -54,13 +59,13 @@ spec:
                 required:
                 - key
                 type: object
+                x-kubernetes-map-type: atomic
               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.
+                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
@@ -88,15 +93,18 @@ spec:
                 - id
                 type: object
               gzipConfigMapRef:
-                description: GzipConfigMapRef is a reference to a ConfigMap binaryData
-                  field containing the dashboard's JSON, compressed with Gzip.
+                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?'
+                    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
@@ -105,6 +113,7 @@ spec:
                 required:
                 - key
                 type: object
+                x-kubernetes-map-type: atomic
               gzipJson:
                 description: GzipJson the dashboard's JSON compressed with Gzip. Base64-encoded
                   when in YAML.
@@ -159,9 +168,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

config/crd/bases/integreatly.org_grafanadatasources.yaml

@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: grafanadatasources.integreatly.org
 spec:
   group: integreatly.org
@@ -22,14 +20,19 @@ spec:
         description: GrafanaDataSource is the Schema for the grafanadatasources API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
@@ -66,12 +69,14 @@ spec:
                     isDefault:
                       type: boolean
                     jsonData:
-                      description: GrafanaDataSourceJsonData contains the most common
-                        json options See https://grafana.com/docs/administration/provisioning/#datasources
+                      description: |-
+                        GrafanaDataSourceJsonData contains the most common json options
+                        See https://grafana.com/docs/administration/provisioning/#datasources
                       properties:
                         addCorsHeader:
-                          description: Useful fields for clickhouse datasource See
-                            https://github.com/Vertamedia/clickhouse-grafana/tree/master/dist/README.md#configure-the-datasource-with-provisioning
+                          description: |-
+                            Useful fields for clickhouse datasource
+                            See 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:
@@ -152,7 +157,9 @@ spec:
                         graphiteVersion:
                           type: string
                         httpHeaderName1:
-                          description: Custom HTTP headers for datasources See https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources
+                          description: |-
+                            Custom HTTP headers for datasources
+                            See https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources
                           type: string
                         httpHeaderName2:
                           type: string
@@ -293,7 +300,9 @@ spec:
                         tsdbVersion:
                           type: string
                         url:
-                          description: Fields for Instana data sources See https://github.com/instana/instana-grafana-datasource/blob/main/provisioning/datasources/datasource.yml
+                          description: |-
+                            Fields for Instana data sources
+                            See https://github.com/instana/instana-grafana-datasource/blob/main/provisioning/datasources/datasource.yml
                           type: string
                         usePOST:
                           type: boolean
@@ -317,8 +326,9 @@ spec:
                     password:
                       type: string
                     secureJsonData:
-                      description: GrafanaDataSourceSecureJsonData contains the most
-                        common secure json options See https://grafana.com/docs/administration/provisioning/#datasources
+                      description: |-
+                        GrafanaDataSourceSecureJsonData contains the most common secure json options
+                        See https://grafana.com/docs/administration/provisioning/#datasources
                       properties:
                         accessKey:
                           type: string
@@ -333,7 +343,9 @@ spec:
                           description: Fields for Azure data sources
                           type: string
                         httpHeaderValue1:
-                          description: Custom HTTP headers for datasources See https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources
+                          description: |-
+                            Custom HTTP headers for datasources
+                            See https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources
                           type: string
                         httpHeaderValue2:
                           type: string
@@ -416,9 +428,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []