Upgrade to go 1.22 (#711)

apache · Jun 14, 2024 · 0af2d73 · 0af2d73
1 parent b2c9510
commit 0af2d73
Show file tree

Hide file tree

Showing 15 changed files with 18,837 additions and 21,098 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        go: [ '1.20' ]
+        go: [ '1.22' ]
 
     steps:
       # Setup

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -47,7 +47,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [ '1.20' ]
+        go-version: [ '1.22' ]
         kube-version: [ 'v1.26.6' ]
         solr-version: [ '9' ] # [ '8', '9' ]
 

diff --git a/.github/workflows/smoke-tests.yaml b/.github/workflows/smoke-tests.yaml
@@ -47,7 +47,7 @@ jobs:
 
     strategy:
       matrix:
-        go: [ '1.20' ]
+        go: [ '1.22' ]
 
     steps:
       # Setup

diff --git a/Makefile b/Makefile
@@ -40,10 +40,10 @@ ARCH = $(shell go env GOARCH)
 TEST_PARALLELISM ?= 3
 
 KUSTOMIZE_VERSION=v4.5.2
-CONTROLLER_GEN_VERSION=v0.10.0
+CONTROLLER_GEN_VERSION=v0.15.0
 GO_LICENSES_VERSION=v1.6.0
 GINKGO_VERSION = $(shell cat go.mod | grep 'github.com/onsi/ginkgo' | sed 's/.*\(v.*\)$$/\1/g')
-KIND_VERSION=v0.20.0
+KIND_VERSION=v0.23.0
 YQ_VERSION=v4.33.3
 CONTROLLER_RUNTIME_VERSION = $(shell cat go.mod | grep 'sigs.k8s.io/controller-runtime' | sed 's/.*\(v\(.*\)\.[^.]*\)$$/\2/g')
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.20 as builder
+FROM golang:1.22 as builder
 
 WORKDIR /workspace
 ARG GO111MODULE=on

diff --git a/config/crd/bases/solr.apache.org_solrbackups.yaml b/config/crd/bases/solr.apache.org_solrbackups.yaml
@@ -19,8 +19,7 @@ metadata:
   annotations:
     operator.solr.apache.org/version: v0.9.0-prerelease
     argocd.argoproj.io/sync-options: Replace=true
-    controller-gen.kubebuilder.io/version: v0.10.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: solrbackups.solr.apache.org
 spec:
   group: solr.apache.org
@@ -62,14 +61,19 @@ spec:
         description: SolrBackup is the Schema for the solrbackups 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
@@ -86,9 +90,11 @@ spec:
                   repository.
                 type: string
               recurrence:
-                description: "Set this backup to be taken recurrently, with options
-                  for scheduling and storage. \n NOTE: This is only supported for
-                  Solr Clouds version 8.9+, as it uses the incremental backup API."
+                description: |-
+                  Set this backup to be taken recurrently, with options for scheduling and storage.
+
+
+                  NOTE: This is only supported for Solr Clouds version 8.9+, as it uses the incremental backup API.
                 properties:
                   disabled:
                     default: false
@@ -97,27 +103,33 @@ spec:
                     type: boolean
                   maxSaved:
                     default: 5
-                    description: Define the number of backup points to save for this
-                      backup at any given time. The oldest backups will be deleted
-                      if too many exist when a backup is taken. If not provided, this
-                      defaults to 5.
+                    description: |-
+                      Define the number of backup points to save for this backup at any given time.
+                      The oldest backups will be deleted if too many exist when a backup is taken.
+                      If not provided, this defaults to 5.
                     minimum: 1
                     type: integer
                   schedule:
-                    description: "Perform a backup on the given schedule, in CRON
-                      format. \n Multiple CRON syntaxes are supported - Standard CRON
-                      (e.g. \"CRON_TZ=Asia/Seoul 0 6 * * ?\") - Predefined Schedules
-                      (e.g. \"@yearly\", \"@weekly\", \"@daily\", etc.) - Intervals
-                      (e.g. \"@every 10h30m\") \n For more information please check
-                      this reference: https://pkg.go.dev/github.com/robfig/cron/v3?utm_source=godoc#hdr-CRON_Expression_Format"
+                    description: |-
+                      Perform a backup on the given schedule, in CRON format.
+
+
+                      Multiple CRON syntaxes are supported
+                        - Standard CRON (e.g. "CRON_TZ=Asia/Seoul 0 6 * * ?")
+                        - Predefined Schedules (e.g. "@yearly", "@weekly", "@daily", etc.)
+                        - Intervals (e.g. "@every 10h30m")
+
+
+                      For more information please check this reference:
+                      https://pkg.go.dev/github.com/robfig/cron/v3?utm_source=godoc#hdr-CRON_Expression_Format
                     type: string
                 required:
                 - schedule
                 type: object
               repositoryName:
-                description: The name of the repository to use for the backup.  Defaults
-                  to "legacy_local_repository" if not specified (the auto-configured
-                  repository for legacy singleton volumes).
+                description: |-
+                  The name of the repository to use for the backup.  Defaults to "legacy_local_repository" if not specified (the
+                  auto-configured repository for legacy singleton volumes).
                 maxLength: 100
                 minLength: 1
                 pattern: '[a-zA-Z0-9]([-_a-zA-Z0-9]*[a-zA-Z0-9])?'