Switch to go 1.21

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
kubernetes-sigs · Aug 30, 2023 · 6a22787 · 6a22787
1 parent 5715433
commit 6a22787
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
     types: [published]
   pull_request:
 env:
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.21'
   NIX_VERSION: '2.15.1'
   BOM_VERSION: v0.5.1
 

diff --git a/.github/workflows/olm_tests.yaml b/.github/workflows/olm_tests.yaml
@@ -5,7 +5,7 @@ on:
       - main
   pull_request:
 env:
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.21'
   KIND_IMG_TAG: v1.27.3
 
 permissions: {}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on:
       - main
   pull_request:
 env:
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.21'
 
 permissions: {}
 

diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ REPO_INFRA_VERSION = v0.2.5
 KUSTOMIZE_VERSION = 5.1.0
 OPERATOR_SDK_VERSION ?= v1.25.0
 ZEITGEIST_VERSION = v0.4.1
-CI_IMAGE ?= golang:1.20
+CI_IMAGE ?= golang:1.21
 
 CONTROLLER_GEN_CMD := CGO_LDFLAGS= $(GO) run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen
 

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -1,6 +1,6 @@
 dependencies:
   - name: go
-    version: 1.20
+    version: 1.21
     refPaths:
     - path: go.mod
       match: go

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/security-profiles-operator
 
-go 1.20
+go 1.21
 
 require (
 	github.com/acobaugh/osrelease v0.1.0

diff --git a/go.sum b/go.sum
diff --git a/hack/ci/Vagrantfile-fedora b/hack/ci/Vagrantfile-fedora
@@ -24,8 +24,8 @@ Vagrant.configure("2") do |config|
       # Use a non-localhost DNS to avoid cluster DNS lookup loops
       echo "nameserver 8.8.8.8" > /etc/resolv.conf
 
-      GO_VERSION=1.20
-      curl -sSfL -o- https://dl.google.com/go/go"$GO_VERSION".linux-amd64.tar.gz |
+      GO_VERSION=1.21
+      curl -sSfL -o- https://go.dev/dl/go$GO_VERSION.0.linux-amd64.tar.gz |
         tar xfz - -C /usr/local
 
       echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile

diff --git a/hack/ci/Vagrantfile-flatcar b/hack/ci/Vagrantfile-flatcar
@@ -61,9 +61,9 @@ Vagrant.configure("2") do |config|
       crictl --runtime-endpoint="unix:///run/containerd/containerd.sock" images
 
       # Install Go
-      GO_VERSION=1.20
+      GO_VERSION=1.21
       mkdir /opt/go
-      curl -sSfL -o- https://golang.org/dl/go$GO_VERSION.linux-amd64.tar.gz | tar xfz - -C /opt
+      curl -sSfL -o- https://go.dev/dl/go$GO_VERSION.0.linux-amd64.tar.gz | tar xfz - -C /opt
 
       # Configure the kernel modules
       cat <<EOF | tee /etc/modules-load.d/k8s.conf

diff --git a/hack/ci/Vagrantfile-ubuntu b/hack/ci/Vagrantfile-ubuntu
@@ -25,8 +25,8 @@ Vagrant.configure("2") do |config|
       # Use a non-localhost DNS to avoid cluster DNS lookup loops
       echo "nameserver 8.8.8.8" > /etc/resolv.conf
 
-      GO_VERSION=1.20
-      curl -sSfL -o- https://dl.google.com/go/go"$GO_VERSION".linux-amd64.tar.gz |
+      GO_VERSION=1.21
+      curl -sSfL -o- https://go.dev/dl/go$GO_VERSION.0.linux-amd64.tar.gz |
         tar xfz - -C /usr/local
 
       # Kubernetes

diff --git a/nix/derivation-bpf.nix b/nix/derivation-bpf.nix
@@ -1,5 +1,5 @@
 { pkgs, buildGoModule, arch ? "x86" }:
-with pkgs; buildGo120Module rec {
+with pkgs; buildGo121Module rec {
   name = "security-profiles-operator";
   src = ./..;
   vendorSha256 = null;

diff --git a/nix/derivation.nix b/nix/derivation.nix
@@ -1,5 +1,5 @@
 { pkgs, buildGoModule }:
-with pkgs; buildGo120Module rec {
+with pkgs; buildGo121Module rec {
   name = "security-profiles-operator";
   src = ./..;
   vendorSha256 = null;

diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json
@@ -1,9 +1,10 @@
 {
   "url": "https://github.com/nixos/nixpkgs",
-  "rev": "7b5ce85d8fc3c3bfe0b5c472be23b742cb1ad2aa",
-  "date": "2023-05-26T00:51:46-06:00",
-  "path": "/nix/store/xvnw4nzq5r4qghfjwnqj7nvv81pd9qfm-nixpkgs",
-  "sha256": "1ssvnf0573jpvji1ihrnv2hdl4qsdbm3hx699izrsvi0sb6m2dsk",
+  "rev": "2530efc97512901a6aae5ddee21e05cc70589dc6",
+  "date": "2023-08-30T12:18:30+02:00",
+  "path": "/nix/store/ghv18qwvks55645q8nvwlz0cjygg3aa8-nixpkgs",
+  "sha256": "1dzysf94dyjmz446dxy68qn84qzl6dddf78gazglhdqxny2zgj0n",
+  "hash": "sha256-Fsj3hbcdN0jfVw8d11oz9GOCLEbG92YI+VX6RpLT/rc=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,