From fc0a24964b06d7473a3a95dd5f922eaceea926d1 Mon Sep 17 00:00:00 2001
From: Michael Fritch <mfritch@suse.com>
Date: Mon, 25 Mar 2024 05:45:53 -0600
Subject: [PATCH] Update to v3.6.2

Also update base image to v1.21.8b1

Issue: https://github.com/rancher/rke2/issues/5089
Signed-off-by: Michael Fritch <mfritch@suse.com>
---
 .drone.yml | 12 ++++++------
 Dockerfile |  4 ++--
 Makefile   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 36ca614..58108bc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,7 +10,7 @@ platform:
 steps:
 - name: build
   pull: always
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.21.8b1
   commands:
   - make DRONE_TAG=${DRONE_TAG}
   volumes:
@@ -18,7 +18,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: publish
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.21.8b1
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - make DRONE_TAG=${DRONE_TAG} image-push
@@ -35,7 +35,7 @@ steps:
     - tag
 
 - name: scan
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.21.8b1
   commands:
   - make DRONE_TAG=${DRONE_TAG} image-scan
   volumes:
@@ -59,7 +59,7 @@ platform:
 steps:
 - name: build
   pull: always
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.21.8b1
   commands:
   - make DRONE_TAG=${DRONE_TAG}
   volumes:
@@ -67,7 +67,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: publish
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.21.8b1
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - make DRONE_TAG=${DRONE_TAG} image-push
@@ -84,7 +84,7 @@ steps:
     - tag
 
 - name: scan
-  image: rancher/hardened-build-base:v1.20.7b3
+  image: rancher/hardened-build-base:v1.21.8b1
   commands:
   - make DRONE_TAG=${DRONE_TAG} image-scan
   volumes:
diff --git a/Dockerfile b/Dockerfile
index 5b20dab..c94e7ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-ARG TAG="v3.5.1"
+ARG TAG="v3.6.2"
 ARG BCI_IMAGE=registry.suse.com/bci/bci-base:latest
-ARG GO_IMAGE=rancher/hardened-build-base:v1.20.7b3
+ARG GO_IMAGE=rancher/hardened-build-base:v1.21.8b1
 
 # Build the project
 FROM ${GO_IMAGE} as builder
diff --git a/Makefile b/Makefile
index f38608d..c990364 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ endif
 BUILD_META=-build$(shell date +%Y%m%d)
 ORG ?= rancher
 # last commit on 2021-10-06
-TAG ?= v3.5.1$(BUILD_META)
+TAG ?= v3.6.2$(BUILD_META)
 
 ifneq ($(DRONE_TAG),)
 	TAG := $(DRONE_TAG)