deps: update go to 1.21.1 (#2389)

.github/workflows/build-ccm-gcp.yml

@@ -31,7 +31,7 @@ jobs:
  - name: Setup Go environment
  uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
  with:
- go-version: "1.20.8"
+ go-version: "1.21.1"
  cache: false
 
  - name: Install Crane

.github/workflows/build-os-image-scheduled.yml

@@ -69,7 +69,7 @@ jobs:
  - name: Setup Go environment
  uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
  with:
- go-version: "1.20.8"
+ go-version: "1.21.1"
  cache: false
 
  - name: Determine version

.github/workflows/build-os-image.yml

@@ -640,7 +640,7 @@ jobs:
  - name: Setup Go environment
  uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
  with:
- go-version: "1.20.8"
+ go-version: "1.21.1"
  cache: true
 
  - name: Create CLI compatibility information artifact

.github/workflows/codeql.yml

@@ -40,7 +40,7 @@ jobs:
  if: matrix.language == 'go'
  uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
  with:
- go-version: "1.20.8"
+ go-version: "1.21.1"
  cache: false
 
  - name: Initialize CodeQL

.github/workflows/release.yml

@@ -219,7 +219,7 @@ jobs:
  - name: Setup Go environment
  uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
  with:
- go-version: "1.20.8"
+ go-version: "1.21.1"
  cache: true
 
  - name: Build generateMeasurements tool

.github/workflows/test-integration.yml

@@ -32,7 +32,7 @@ jobs:
  - name: Setup Go environment
  uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
  with:
- go-version: "1.20.8"
+ go-version: "1.21.1"
  cache: true
 
  - name: Install Dependencies

.github/workflows/test-operator-codegen.yml

@@ -28,7 +28,7 @@ jobs:
  - name: Setup Go environment
  uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
  with:
- go-version: "1.20.8"
+ go-version: "1.21.1"
  cache: true
 
  - name: Run code generation

3rdparty/gcp-guest-agent/Dockerfile

@@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y \
  git
 
 # Install Go
-ARG GO_VER=1.20.8
+ARG GO_VER=1.21.1
 RUN wget -q https://go.dev/dl/go${GO_VER}.linux-amd64.tar.gz && \
  tar -C /usr/local -xzf go${GO_VER}.linux-amd64.tar.gz && \
  rm go${GO_VER}.linux-amd64.tar.gz

3rdparty/node-maintenance-operator/go.mod

@@ -1,6 +1,6 @@
 module github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator
 
-go 1.20
+go 1.21
 
 require (
  k8s.io/apimachinery v0.27.3

3rdparty/node-maintenance-operator/go.sum

@@ -5,13 +5,16 @@ github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -22,13 +25,17 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
+github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
 github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
+github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -49,6 +56,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
@@ -58,6 +66,7 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -70,7 +79,9 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
+k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4=
 k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM=
 k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
 k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
@@ -84,3 +95,4 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h6
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

bazel/ci/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@bazel_gazelle//:def.bzl", "gazelle")
-load("@com_github_ash2k_bazel_tools//multirun:def.bzl", "multirun")
+load("@com_github_ash2k_bazel_tools//multirun:def.bzl", "command", "multirun")
 load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier", "buildifier_test")
 load("//bazel/ci:proto_targets.bzl", "proto_targets")
 load("//bazel/sh:def.bzl", "noop_warn", "repo_command", "sh_template")
@@ -9,6 +9,18 @@ required_tags = [
  "integration",
 ]
 
+# TODO(malt3): Remove this once we have a better solution for
+# gazelle not respecting the default go env.
+command(
+ name = "cmd_gazelle_update_repos",
+ command = ":gazelle_update_repos",
+ environment = {
+ "GOPROXY": "https://proxy.golang.org,direct",
+ "GOSUMDB": "sum.golang.org",
+ "GOTOOLCHAIN": "local",
+ },
+)
+
 gazelle(
  name = "gazelle_generate",
  build_tags = required_tags,
@@ -482,7 +494,7 @@ multirun(
  ":shfmt",
  ":gofumpt",
  ":go_mod_tidy",
- ":gazelle_update_repos",
+ ":cmd_gazelle_update_repos",
  ":gazelle_generate",
  ":buildifier_fix",
  ":terraform_fmt",

bazel/nixos-support/nixos-support.bzl

@@ -11,7 +11,10 @@ load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_cc_configure")
 load("@io_tweag_rules_nixpkgs//nixpkgs:toolchains/go.bzl", "nixpkgs_go_configure")
 
 def go_toolchain():
- nixpkgs_go_configure(repository = "@nixpkgs")
+ nixpkgs_go_configure(
+ repository = "@nixpkgs",
+ attribute_path = "go_1_21",
+ )
 
 def cc_toolchain():
  nixpkgs_cc_configure(repository = "@nixpkgs")
@@ -33,7 +36,7 @@ def cc_toolchain():
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains")
 
 def go_toolchain():
- go_register_toolchains(version = "1.20.8")
+ go_register_toolchains(version = "1.21.1")
 
 def cc_toolchain():
  native.register_toolchains(

bazel/toolchains/go_rules_deps.bzl

@@ -9,11 +9,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 def go_deps():
  http_archive(
  name = "io_bazel_rules_go",
- sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
+ sha256 = "52325c7e982179c97530228a98ffd964530f746de91cf3dc77a134f9fbe7c53a",
+ strip_prefix = "rules_go-c2406b27f77e186d0fb3548d8526e6c14a3236d4",
  urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
- "https://cdn.confidential.cloud/constellation/cas/sha256/278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
- "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
+ "https://cdn.confidential.cloud/constellation/cas/sha256/52325c7e982179c97530228a98ffd964530f746de91cf3dc77a134f9fbe7c53a",
+ "https://github.com/bazelbuild/rules_go/archive/c2406b27f77e186d0fb3548d8526e6c14a3236d4.zip",
  ],
  type = "zip",
  )

bazel/toolchains/nixpkgs_deps.bzl

@@ -5,11 +5,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 def nixpkgs_deps():
  http_archive(
  name = "io_tweag_rules_nixpkgs",
- sha256 = "1eb0ef4f8388a9b53f99587a6282250852a03eab3160313e584ada7005a7ab53",
- strip_prefix = "rules_nixpkgs-ee5c44a5bc470d13699960f493d42ed4c4d806af",
+ sha256 = "6a7c2a85b9d21c0ba617229597f1bda3c871b0ec81090d89f75f3acdef32cd16",
+ strip_prefix = "rules_nixpkgs-bb2f6996e1e6933cecaf06e60799ca7c90ef3928",
  urls = [
- "https://cdn.confidential.cloud/constellation/cas/sha256/1eb0ef4f8388a9b53f99587a6282250852a03eab3160313e584ada7005a7ab53",
- "https://github.com/tweag/rules_nixpkgs/archive/ee5c44a5bc470d13699960f493d42ed4c4d806af.tar.gz",
+ "https://cdn.confidential.cloud/constellation/cas/sha256/6a7c2a85b9d21c0ba617229597f1bda3c871b0ec81090d89f75f3acdef32cd16",
+ "https://github.com/tweag/rules_nixpkgs/archive/bb2f6996e1e6933cecaf06e60799ca7c90ef3928.tar.gz",
  ],
  type = "tar.gz",
  )

go.mod

@@ -1,6 +1,6 @@
 module github.com/edgelesssys/constellation/v2
 
-go 1.20
+go 1.21
 
 replace (
  k8s.io/api v0.0.0 => k8s.io/api v0.27.2