Upgrade to go v1.21.1 (fluxninja#2650)

**Chore:** - Upgraded Go programming language version from 1.20.6 to 1.21.1 across all Dockerfiles, scripts, and configuration files. This update brings in the latest features, improvements, and bug fixes from the new Go version. - Updated cache keys for ASDF (Another System Definition Facility) in CircleCI configuration files to ensure correct cache restoration and saving based on the updated cache version. - Bumped up golangci-lint version from 1.53.3 to 1.54.2 in .tool-versions file for enhanced linting capabilities. These changes are part of routine maintenance and upgrade tasks and do not directly impact end-user functionality.
sitedata · Sep 20, 2023 · 5315f65 · 5315f65
1 parent aa68a28
commit 5315f65
Show file tree

Hide file tree

Showing 22 changed files with 134 additions and 34 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -42,10 +42,10 @@ commands:
       - restore_cache:
           name: Restore ASDF cache
           keys:
-            - aperture-asdf-cache-v11-{{ checksum "~/month" }}-<<
+            - aperture-asdf-cache-v12-{{ checksum "~/month" }}-<<
               parameters.cache_name >>-{{ checksum ".tool-versions" }}-{{
               checksum "go.mod" }}
-            - aperture-asdf-cache-v11-{{ checksum "~/month" }}-<<
+            - aperture-asdf-cache-v12-{{ checksum "~/month" }}-<<
               parameters.cache_name >>-
       - run:
           name: Copy tool-versions in HOME dir
@@ -66,7 +66,7 @@ commands:
       - save_cache:
           name: Save ASDF cache
           key:
-            aperture-asdf-cache-v11-{{ checksum "~/month" }}-<<
+            aperture-asdf-cache-v12-{{ checksum "~/month" }}-<<
             parameters.cache_name >>-{{ checksum ".tool-versions" }}-{{ checksum
             "go.mod" }}
           paths:

diff --git a/.circleci/continue-workflows.yml b/.circleci/continue-workflows.yml
@@ -13,7 +13,7 @@ executors:
       - image: cimg/base:2022.07
   go-cimg-executor:
     docker:
-      - image: cimg/go:1.20.6
+      - image: cimg/go:1.21.1
         user: root
   python-cimg-executor:
     docker:
@@ -316,7 +316,7 @@ jobs:
       - restore_cache:
           name: Restore daily cache
           keys:
-            - aperture-v9-daily-cache-{{ checksum "~/day" }}
+            - aperture-v10-daily-cache-{{ checksum "~/day" }}
       - run: &install_opsninja
           name: Install opsninja and its dependencies
           command: |
@@ -397,7 +397,7 @@ jobs:
             fi
       - save_cache:
           name: Save daily cache
-          key: aperture-v9-daily-cache-{{ checksum "~/day" }}
+          key: aperture-v10-daily-cache-{{ checksum "~/day" }}
           paths:
             - ../.cache/go-build
             - ../.cache/golangci-lint
@@ -1088,7 +1088,7 @@ jobs:
       - restore_cache:
           name: Restore go cache
           keys:
-            - aperture-v2-go-cache-upload-policies
+            - aperture-v3-go-cache-upload-policies
       - run:
           name: Apply Policy
           working_directory: .
@@ -1097,7 +1097,7 @@ jobs:
             --controller << parameters.controller-endpoint >> --api-key ${CONTROLLER_API_KEY} -f -s
       - save_cache:
           name: Save go cache
-          key: aperture-v2-go-cache-upload-policies
+          key: aperture-v3-go-cache-upload-policies
           paths:
             - ../.cache/go-build
             - ./blueprints/vendor
@@ -1497,10 +1497,10 @@ commands:
       - restore_cache:
           name: Restore ASDF cache
           keys:
-            - aperture-asdf-cache-v11-{{ checksum "~/month" }}-<<
+            - aperture-asdf-cache-v12-{{ checksum "~/month" }}-<<
               parameters.cache_name >>-{{ checksum ".tool-versions" }}-{{
               checksum "tools/go/go.mod" }}
-            - aperture-asdf-cache-v11-{{ checksum "~/month" }}-<<
+            - aperture-asdf-cache-v12-{{ checksum "~/month" }}-<<
               parameters.cache_name >>-
       - run:
           name: Copy tool-versions in HOME dir
@@ -1522,7 +1522,7 @@ commands:
       - save_cache:
           name: Save ASDF cache
           key:
-            aperture-asdf-cache-v11-{{ checksum "~/month" }}-<<
+            aperture-asdf-cache-v12-{{ checksum "~/month" }}-<<
             parameters.cache_name >>-{{ checksum ".tool-versions" }}-{{ checksum
             "tools/go/go.mod" }}
           paths:

diff --git a/.circleci/post-release.yaml b/.circleci/post-release.yaml
@@ -410,10 +410,10 @@ commands:
       - restore_cache:
           name: Restore ASDF cache
           keys:
-            - aperture-asdf-cache-v11-{{ checksum "~/month" }}-<<
+            - aperture-asdf-cache-v12-{{ checksum "~/month" }}-<<
               parameters.cache_name >>-{{ checksum ".tool-versions" }}-{{
               checksum "go.mod" }}-{{ checksum "~/installed-tools" }}
-            - aperture-asdf-cache-v11-{{ checksum "~/month" }}-<<
+            - aperture-asdf-cache-v12-{{ checksum "~/month" }}-<<
               parameters.cache_name >>-
       - run:
           name: Copy tool-versions in HOME dir
@@ -438,7 +438,7 @@ commands:
       - save_cache:
           name: Save ASDF cache
           key:
-            aperture-asdf-cache-v11-{{ checksum "~/month" }}-<<
+            aperture-asdf-cache-v12-{{ checksum "~/month" }}-<<
             parameters.cache_name >>-{{ checksum ".tool-versions" }}-{{ checksum
             "go.mod" }}-{{ checksum "~/installed-tools" }}
           paths:

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -6,7 +6,7 @@ run:
   modules-download-mode: readonly
   allow-parallel-runners: true
   allow-serial-runners: true
-  go: "1.20"
+  go: "1.21"
 linters-settings:
   goimports:
     local-prefixes: github.com/fluxninja

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -56,7 +56,7 @@ repos:
       - id: go-generate
       - id: go-mod-tidy-repo
         args:
-          - -compat=1.20
+          - -compat=1.21
   - repo: meta
     hooks:
       - id: check-hooks-apply

diff --git a/.tool-versions b/.tool-versions
@@ -2,8 +2,8 @@ pre-commit 3.3.1
 bats 1.9.0
 python 3.11.4
 gcloud 429.0.0
-golang 1.20.6
-golangci-lint 1.53.3
+golang 1.21.1
+golangci-lint 1.54.2
 grpcurl 1.8.7
 mockery 2.26.1
 buf 1.25.0

diff --git a/cmd/aperture-agent/Dockerfile b/cmd/aperture-agent/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM golang:1.20.6-bullseye AS builder
+FROM golang:1.21.1-bullseye AS builder
 
 WORKDIR /src
 COPY --link . .
@@ -15,8 +15,8 @@ ARG APERTURECTL_BUILD_FLAGS
 ENV APERTURECTL_BUILD_FLAGS=${APERTURECTL_BUILD_FLAGS}
 
 RUN --mount=type=cache,target=/go/pkg/ \
-  --mount=type=cache,target=/root/.cache/go-build/,id=agent-1.20.6,sharing=private \
-  --mount=type=cache,target=/root/.aperturectl,id=agent-1.20.6,sharing=private \
+  --mount=type=cache,target=/root/.cache/go-build/,id=agent-1.21.1,sharing=private \
+  --mount=type=cache,target=/root/.aperturectl,id=agent-1.21.1,sharing=private \
   /bin/bash -c \
   'set -eu; \
   go mod download; \

diff --git a/cmd/aperture-controller/Dockerfile b/cmd/aperture-controller/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM golang:1.20.6-bullseye AS builder
+FROM golang:1.21.1-bullseye AS builder
 
 WORKDIR /src
 COPY --link . .
@@ -15,8 +15,8 @@ ARG APERTURECTL_BUILD_FLAGS
 ENV APERTURECTL_BUILD_FLAGS=${APERTURECTL_BUILD_FLAGS}
 
 RUN --mount=type=cache,target=/go/pkg/ \
-  --mount=type=cache,target=/root/.cache/go-build/,id=controller-1.20.6,sharing=private \
-  --mount=type=cache,target=/root/.aperturectl,id=controller-1.20.6,sharing=private \
+  --mount=type=cache,target=/root/.cache/go-build/,id=controller-1.21.1,sharing=private \
+  --mount=type=cache,target=/root/.aperturectl,id=controller-1.21.1,sharing=private \
   /bin/bash -c \
   'go mod download; \
   ./scripts/build_aperturectl.sh ./cmd/aperturectl; \

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxninja/aperture/v2
 
-go 1.20
+go 1.21
 
 require (
 	github.com/BurntSushi/toml v1.3.2