chore: Bump to Go 1.22 (#37)

epam · May 16, 2024 · 3e4ab7b · 3e4ab7b
1 parent ef746f2
commit 3e4ab7b
Show file tree

Hide file tree

Showing 26 changed files with 437 additions and 253 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        go: [ '1.20' ]
+        go: [ '1.22' ]
 
     name: Go ${{ matrix.go }} sample
 

diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
@@ -5,7 +5,7 @@ on:
     branches: [ master ]
 
 env:
-  GOLANG_VERSION: '1.20'
+  GOLANG_VERSION: '1.22'
 
 jobs:
 

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
@@ -4,6 +4,9 @@ on:
   push:
     branches: [ master ]
 
+env:
+  GOLANG_VERSION: '1.22'
+
 jobs:
   analyze:
     name: Analyze
@@ -18,6 +21,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: ${{ env.GOLANG_VERSION }}
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -5,7 +5,7 @@ on:
       - 'v*'
 
 env:
-    GOLANG_VERSION: '1.20'
+    GOLANG_VERSION: '1.22'
 
 jobs:
   prepare-release:

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,6 +1,6 @@
 run:
   timeout: 5m
-  go: "1.20"
+  go: "1.22"
   issues-exit-code: 1
   build-tags:
     - mytag
@@ -284,7 +284,7 @@ linters-settings:
     simplify: true
 
   gofumpt:
-    lang-version: "1.20"
+    lang-version: "1.22"
 
     # Choose whether or not to use the extra rules that are disabled
     # by default

diff --git a/Makefile b/Makefile
@@ -112,7 +112,7 @@ helm-docs: helmdocs	## generate helm docs
 GOLANGCILINT = ${CURRENT_DIR}/bin/golangci-lint
 .PHONY: golangci-lint
 golangci-lint: ## Download golangci-lint locally if necessary.
-	$(call go-get-tool,$(GOLANGCILINT),github.com/golangci/golangci-lint/cmd/golangci-lint,v1.52.2)
+	$(call go-get-tool,$(GOLANGCILINT),github.com/golangci/golangci-lint/cmd/golangci-lint,v1.58.1)
 
 .PHONY: install
 install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
@@ -155,7 +155,7 @@ crdoc: ## Download crdoc locally if necessary.
 CONTROLLER_GEN = $(LOCALBIN)/controller-gen
 .PHONY: controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen,v0.13.0)
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen,v0.15.0)
 # go-get-tool will 'go get' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 define go-get-tool

diff --git a/config/crd/bases/v2.edp.epam.com_gerritgroupmembers.yaml b/config/crd/bases/v2.edp.epam.com_gerritgroupmembers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: gerritgroupmembers.v2.edp.epam.com
 spec:
   group: v2.edp.epam.com
@@ -20,14 +20,19 @@ spec:
         description: GerritGroupMember is the Schema for the gerrit group member 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
@@ -70,14 +75,19 @@ spec:
         description: GerritGroupMember is the Schema for the gerrit group member 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

diff --git a/config/crd/bases/v2.edp.epam.com_gerritgroups.yaml b/config/crd/bases/v2.edp.epam.com_gerritgroups.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: gerritgroups.v2.edp.epam.com
 spec:
   group: v2.edp.epam.com
@@ -20,14 +20,19 @@ spec:
         description: GerritGroup is the Schema for the gerrit group 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
@@ -67,14 +72,19 @@ spec:
         description: GerritGroup is the Schema for the gerrit group 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

diff --git a/config/crd/bases/v2.edp.epam.com_gerritmergerequests.yaml b/config/crd/bases/v2.edp.epam.com_gerritmergerequests.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: gerritmergerequests.v2.edp.epam.com
 spec:
   group: v2.edp.epam.com
@@ -21,14 +21,19 @@ spec:
           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
@@ -53,40 +58,42 @@ spec:
                 example: John Doe
                 type: string
               changesConfigMap:
-                description: 'ChangesConfigMap is the name of the ConfigMap, which
-                  contains files contents that should be merged. ConfigMap should
-                  contain eny data keys with content in the json format: {"path":
-                  "/controllers/user.go", "contents": "some code here"} - to add file
-                  or format: {"path": "/controllers/user.go"} - to remove file. If
-                  files already exist in the project, they will be overwritten. If
-                  empty, sourceBranch should be set.'
+                description: |-
+                  ChangesConfigMap is the name of the ConfigMap, which contains files contents that should be merged.
+                  ConfigMap should contain eny data keys with content in the json
+                  format: {"path": "/controllers/user.go", "contents": "some code here"} - to add file
+                  or format: {"path": "/controllers/user.go"} - to remove file.
+                  If files already exist in the project, they will be overwritten.
+                  If empty, sourceBranch should be set.
                 example: config-map-new-feature
                 type: string
               commitMessage:
-                description: CommitMessage is the commit message for the merge request.
+                description: |-
+                  CommitMessage is the commit message for the merge request.
                   If empty, the operator will generate the commit message.
                 example: merge new-feature to master
                 type: string
               ownerName:
-                description: OwnerName is the name of Gerrit CR, which should be used
-                  to initialize the client. If empty, the operator will get first
-                  Gerrit CR from the namespace.
+                description: |-
+                  OwnerName is the name of Gerrit CR, which should be used to initialize the client.
+                  If empty, the operator will get first Gerrit CR from the namespace.
                 example: gerrit
                 type: string
               projectName:
                 description: ProjectName is gerrit project name.
                 example: my-project
                 type: string
               sourceBranch:
-                description: SourceBranch is the name of the branch from which the
-                  changes should be merged. If empty, changesConfigMap should be set.
+                description: |-
+                  SourceBranch is the name of the branch from which the changes should be merged.
+                  If empty, changesConfigMap should be set.
                 example: new-feature
                 type: string
               targetBranch:
                 default: master
-                description: TargetBranch is the name of the branch to which the changes
-                  should be merged. If changesConfigMap is set, the targetBranch can
-                  be only the origin HEAD branch.
+                description: |-
+                  TargetBranch is the name of the branch to which the changes should be merged.
+                  If changesConfigMap is set, the targetBranch can be only the origin HEAD branch.
                 example: master
                 type: string
             required:
@@ -117,14 +124,19 @@ spec:
           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
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ on: @@
         branches: [ master ]
     env:
-      GOLANG_VERSION: '1.20'
+      GOLANG_VERSION: '1.22'
     jobs:
@@ Expand Down @@