From c12e4d04010ef7b4a70dbd939d3cadb04e708fb0 Mon Sep 17 00:00:00 2001
From: justinsb <justinsb@google.com>
Date: Fri, 5 Apr 2024 09:58:19 -0400
Subject: [PATCH] chore: update go version to 1.22.2

Also update bazelisk while we're here.
---
 .github/workflows/main.yml      | 8 ++++----
 dev/staging/cloudbuild.yaml     | 2 +-
 dev/staging/push-etcdmanager.sh | 2 +-
 etcd-manager/WORKSPACE          | 8 ++++----
 etcd-manager/go.mod             | 2 ++
 go.mod                          | 2 ++
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5ab778c71..e9ee39895 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
 
     - name: Install bazelisk
       run: |
-        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64"
+        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64"
         mkdir -p "${GITHUB_WORKSPACE}/bin/"
         mv bazelisk-linux-amd64 "${GITHUB_WORKSPACE}/bin/bazel"
         chmod +x "${GITHUB_WORKSPACE}/bin/bazel"
@@ -31,7 +31,7 @@ jobs:
 
     - name: Install bazelisk
       run: |
-        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64"
+        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64"
         mkdir -p "${GITHUB_WORKSPACE}/bin/"
         mv bazelisk-linux-amd64 "${GITHUB_WORKSPACE}/bin/bazel"
         chmod +x "${GITHUB_WORKSPACE}/bin/bazel"
@@ -49,7 +49,7 @@ jobs:
 
     - name: Install bazelisk
       run: |
-        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64"
+        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64"
         mkdir -p "${GITHUB_WORKSPACE}/bin/"
         mv bazelisk-linux-amd64 "${GITHUB_WORKSPACE}/bin/bazel"
         chmod +x "${GITHUB_WORKSPACE}/bin/bazel"
@@ -67,7 +67,7 @@ jobs:
 
     - name: Install bazelisk
       run: |
-        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64"
+        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64"
         mkdir -p "${GITHUB_WORKSPACE}/bin/"
         mv bazelisk-linux-amd64 "${GITHUB_WORKSPACE}/bin/bazel"
         chmod +x "${GITHUB_WORKSPACE}/bin/bazel"
diff --git a/dev/staging/cloudbuild.yaml b/dev/staging/cloudbuild.yaml
index f380412f0..7ff781276 100644
--- a/dev/staging/cloudbuild.yaml
+++ b/dev/staging/cloudbuild.yaml
@@ -5,7 +5,7 @@ options:
   machineType: 'N1_HIGHCPU_8'
 
 steps:
-- name: golang:1.19
+- name: golang:1.22
   waitFor: ['-']
   env:
   - PULL_BASE_REF=$_PULL_BASE_REF
diff --git a/dev/staging/push-etcdmanager.sh b/dev/staging/push-etcdmanager.sh
index cd4e07940..9dffe75ad 100755
--- a/dev/staging/push-etcdmanager.sh
+++ b/dev/staging/push-etcdmanager.sh
@@ -43,7 +43,7 @@ if [[ "${ARTIFACT_LOCATION}" != */ ]]; then
 fi
 
 if [[ -n "${INSTALL_BAZELISK:-}" ]]; then
-  DOWNLOAD_URL="https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64"
+  DOWNLOAD_URL="https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64"
   echo "Downloading bazelisk from $DOWNLOAD_URL"
   curl -L --output "/tmp/bazelisk" "${DOWNLOAD_URL}"
   chmod +x "/tmp/bazelisk"
diff --git a/etcd-manager/WORKSPACE b/etcd-manager/WORKSPACE
index d74683356..49c2632d1 100644
--- a/etcd-manager/WORKSPACE
+++ b/etcd-manager/WORKSPACE
@@ -7,10 +7,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "56d8c5a5c91e1af73eca71a6fab2ced959b67c86d12ba37feedb0a2dfea441a6",
+    sha256 = "80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
     ],
 )
 
@@ -28,7 +28,7 @@ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 
 go_rules_dependencies()
 
-go_register_toolchains(version = "1.19.9")
+go_register_toolchains(version = "1.22.2")
 
 gazelle_dependencies()
 
diff --git a/etcd-manager/go.mod b/etcd-manager/go.mod
index 4869fd2c2..c578bedc1 100644
--- a/etcd-manager/go.mod
+++ b/etcd-manager/go.mod
@@ -2,6 +2,8 @@ module sigs.k8s.io/etcdadm/etcd-manager
 
 go 1.18
 
+toolchain go1.22.2
+
 require (
 	cloud.google.com/go/compute/metadata v0.2.3
 	github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
diff --git a/go.mod b/go.mod
index 152c0b87f..8532caede 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,8 @@ module sigs.k8s.io/etcdadm
 
 go 1.18
 
+toolchain go1.22.2
+
 // This is 3.4.14; see https://github.com/etcd-io/etcd/issues/11154 for the reason.
 replace go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20201125193152-8a03d2e9614b // indirect