From 0f98a7da5b5d8a7dcb41b8a151a906fb8134e5f2 Mon Sep 17 00:00:00 2001
From: Michal Jura <mjura@suse.com>
Date: Fri, 9 Aug 2024 15:42:40 +0200
Subject: [PATCH] Enforce latest go version and bump to bci image to 15.6

(cherry picked from commit 2b1bac0fa80fa3d156de475db556b38ddb3d4a90)
---
 .github/workflows/release.yaml | 5 +++++
 go.mod                         | 4 +++-
 package/Dockerfile             | 4 ++--
 test/e2e/Dockerfile.e2e        | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 100580dc..37f4c04c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -43,6 +43,11 @@ jobs:
       with:
         fetch-depth: 0
         ref: ${{ github.ref_name}}
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version-file: 'go.mod'
+        check-latest: true
     - name: Build and push all image variations
       run: |
         make operator
diff --git a/go.mod b/go.mod
index 303a2710..68038ab2 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,8 @@
 module github.com/rancher/aks-operator
 
-go 1.20
+go 1.22.0
+
+toolchain go1.22.5
 
 replace k8s.io/client-go => k8s.io/client-go v0.28.6
 
diff --git a/package/Dockerfile b/package/Dockerfile
index 8656690c..8f6c41c9 100644
--- a/package/Dockerfile
+++ b/package/Dockerfile
@@ -1,8 +1,8 @@
-FROM registry.suse.com/bci/bci-base:15.5 AS builder
+FROM registry.suse.com/bci/bci-base:15.6 AS builder
 RUN sed -i 's/^CREATE_MAIL_SPOOL=yes/CREATE_MAIL_SPOOL=no/' /etc/default/useradd
 RUN useradd --uid 1007 aks-operator
 
-FROM registry.suse.com/bci/bci-micro:15.5
+FROM registry.suse.com/bci/bci-micro:15.6
 COPY --from=builder /etc/passwd /etc/passwd
 COPY --from=builder /etc/shadow /etc/shadow
 
diff --git a/test/e2e/Dockerfile.e2e b/test/e2e/Dockerfile.e2e
index b79dd06c..82ba4b65 100644
--- a/test/e2e/Dockerfile.e2e
+++ b/test/e2e/Dockerfile.e2e
@@ -1,4 +1,4 @@
-FROM registry.suse.com/bci/golang:1.21 AS build
+FROM registry.suse.com/bci/golang:1.22 AS build
 RUN zypper -n install -l openssl-devel
 WORKDIR /src
 COPY go.mod go.sum /src/