Bump Go version to 1.22 & controller-gen to 0.14 (#1437)

* bump go version to 1.22 * bump controller-gen to 0.14 * make manifests & generate deepcopy * ensure latest go-licenses version * make licenses * cache on go.mod as well as go.sum * specify full version in go.mod * avoid using main branch when label added * changes as per review * Remove checkout ref from e2e gov tests Co-authored-by: josvaz <jose.vazquez@mongodb.com> --------- Co-authored-by: josvaz <jose.vazquez@mongodb.com>
mongodb · Mar 22, 2024 · 065d6f0 · 065d6f0
1 parent e29274d
commit 065d6f0
Show file tree

Hide file tree

Showing 29 changed files with 360 additions and 341 deletions.
diff --git a/.github/actions/build-push-image/action.yaml b/.github/actions/build-push-image/action.yaml
@@ -81,7 +81,7 @@ runs:
         path: |
           ~/.cache/go-build
           ~/go/pkg/mod
-        key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
+        key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum', '**/go.mod') }}
     - name: Download go build dependencies
       shell: bash
       run: |

diff --git a/.github/actions/gen-install-scripts/Dockerfile b/.github/actions/gen-install-scripts/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21
+FROM golang:1.22
 
 ENV KUBECTL_VERSION 1.18.12
 ENV GO111MODULE on
@@ -15,7 +15,7 @@ RUN cd /usr/local/bin &&\
 RUN CONTROLLER_GEN_TMP_DIR=$(mktemp -d) && \
     cd $CONTROLLER_GEN_TMP_DIR && \
     go mod init tmp && \
-    go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2 && \
+    go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 && \
     rm -rf $CONTROLLER_GEN_TMP_DIR && \
     CONTROLLER_GEN=${GOBIN}/controller-gen
 

diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
@@ -18,7 +18,7 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum', '**/go.mod') }}
 
       - name: Setup Go
         uses: actions/setup-go@v5

diff --git a/.github/workflows/rebuild-released-images.yaml b/.github/workflows/rebuild-released-images.yaml
@@ -89,7 +89,7 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum', '**/go.mod') }}
       - name: Download go build dependencies
         shell: bash
         run: |

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -92,7 +92,7 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-go-full-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-go-full-${{ hashFiles('**/go.sum', '**/go.mod') }}
       - name: Get go dependencies if cache is missed
         if: steps.cache-go.outputs.cache-hit != 'true'
         run: |
@@ -180,7 +180,7 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-go-full-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-go-full-${{ hashFiles('**/go.sum', '**/go.mod') }}
       - name: Get go dependencies if cache is missed
         if: steps.get-go-deps.outputs.cache-hit != 'true'
         run: |

diff --git a/.github/workflows/test-int.yml b/.github/workflows/test-int.yml
@@ -44,7 +44,7 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum', '**/go.mod') }}
       - name: Setup Go
         uses: actions/setup-go@v5
         with:

diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -18,7 +18,7 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum', '**/go.mod') }}
 
       - name: Setup Go
         uses: actions/setup-go@v5

diff --git a/.github/workflows/validate-manifests.yml b/.github/workflows/validate-manifests.yml
@@ -18,7 +18,7 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum', '**/go.mod') }}
 
       - name: Setup Go
         uses: actions/setup-go@v5

diff --git a/.licenses-gomod.sha256 b/.licenses-gomod.sha256
@@ -1 +1 @@
-100644 4b8a340e51c1d5690d82b9cd1e9c768de7db84e9 go.mod
+100644 7a60e838b5b0f5aa778a2eb04ee5a06e8838c43c go.mod
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/Dockerfile.post-install b/Dockerfile.post-install
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 
 ENV CGO_ENABLED=0
 ENV GOOS=linux

diff --git a/Makefile b/Makefile
@@ -113,7 +113,7 @@ help: ## Show this help screen
 all: manager ## Build all binaries
 
 go-licenses:
-	@which go-licenses || go install github.com/google/go-licenses@latest
+	go install github.com/google/go-licenses@latest
 
 licenses.csv: go-licenses go.mod ## Track licenses in a CSV file
 	@echo "Tracking licenses into file $@"
@@ -239,7 +239,7 @@ vet: $(TIMESTAMPS_DIR)/vet ## Run go vet against code
 
 .PHONY: controller-gen
 controller-gen: ## Download controller-gen locally if necessary
-	@which controller-gen || go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
 
 .PHONY: generate
 generate: controller-gen ${GO_SOURCES} ## Generate code

diff --git a/config/crd/bases/atlas.mongodb.com_atlasbackuppolicies.yaml b/config/crd/bases/atlas.mongodb.com_atlasbackuppolicies.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: atlasbackuppolicies.atlas.mongodb.com
 spec:
   group: atlas.mongodb.com
@@ -21,14 +20,19 @@ spec:
         description: AtlasBackupPolicy is the Schema for the atlasbackuppolicies 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
@@ -40,11 +44,9 @@ spec:
                 items:
                   properties:
                     frequencyInterval:
-                      description: Desired frequency of the new backup policy item
-                        specified by FrequencyType. A value of 1 specifies the first
-                        instance of the corresponding FrequencyType. The only accepted
-                        value you can set for frequency interval with NVMe clusters
-                        is 12.
+                      description: |-
+                        Desired frequency of the new backup policy item specified by FrequencyType. A value of 1 specifies the first instance of the corresponding FrequencyType.
+                        The only accepted value you can set for frequency interval with NVMe clusters is 12.
                       enum:
                       - 1
                       - 2
@@ -148,10 +150,9 @@ spec:
                   type: object
                 type: array
               observedGeneration:
-                description: ObservedGeneration indicates the generation of the resource
-                  specification that the Atlas Operator is aware of. The Atlas Operator
-                  updates this field to the 'metadata.generation' as soon as it starts
-                  reconciliation of the resource.
+                description: |-
+                  ObservedGeneration indicates the generation of the resource specification that the Atlas Operator is aware of.
+                  The Atlas Operator updates this field to the 'metadata.generation' as soon as it starts reconciliation of the resource.
                 format: int64
                 type: integer
             required:

diff --git a/config/crd/bases/atlas.mongodb.com_atlasbackupschedules.yaml b/config/crd/bases/atlas.mongodb.com_atlasbackupschedules.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: atlasbackupschedules.atlas.mongodb.com
 spec:
   group: atlas.mongodb.com
@@ -22,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
@@ -175,10 +179,9 @@ spec:
                   type: string
                 type: array
               observedGeneration:
-                description: ObservedGeneration indicates the generation of the resource
-                  specification that the Atlas Operator is aware of. The Atlas Operator
-                  updates this field to the 'metadata.generation' as soon as it starts
-                  reconciliation of the resource.
+                description: |-
+                  ObservedGeneration indicates the generation of the resource specification that the Atlas Operator is aware of.
+                  The Atlas Operator updates this field to the 'metadata.generation' as soon as it starts reconciliation of the resource.
                 format: int64
                 type: integer
             required:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		100644 4b8a340e51c1d5690d82b9cd1e9c768de7db84e9 go.mod
		100644 7a60e838b5b0f5aa778a2eb04ee5a06e8838c43c go.mod