From 06d327d3a11b2a13f84a3edfd69c06bef8a88329 Mon Sep 17 00:00:00 2001
From: Partho Bhowmick <partho_bhowmick@optum.com>
Date: Thu, 26 Dec 2024 14:54:12 -0600
Subject: [PATCH] patched from main HEAD

---
 .github/labels.yaml | 3 +++
 Dockerfile          | 6 +++---
 Makefile            | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/labels.yaml b/.github/labels.yaml
index 28fa572e2..8551b6c1f 100644
--- a/.github/labels.yaml
+++ b/.github/labels.yaml
@@ -16,3 +16,6 @@
 - name: backport:release/v1.0.x
   description: To be backported to release/v1.0.x
   color: '#ffd700'
+- name: backport:release/v1.1.x
+  description: To be backported to release/v1.1.x
+  color: '#ffd700'
diff --git a/Dockerfile b/Dockerfile
index fb5ba289b..f90055863 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 ARG GO_VERSION=1.23
-ARG XX_VERSION=1.4.0
+ARG XX_VERSION=1.6.1
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 
 # Docker buildkit multi-arch build requires golang alpine
-FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine as builder
+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS builder
 
 # Copy the build utilities.
 COPY --from=xx / /
@@ -31,7 +31,7 @@ COPY internal/ internal/
 ENV CGO_ENABLED=0
 RUN xx-go build -trimpath -a -o helm-controller main.go
 
-FROM alpine:3.19
+FROM alpine:3.21
 
 RUN apk add --no-cache ca-certificates \
     && update-ca-certificates
diff --git a/Makefile b/Makefile
index 46223f7a7..ea3737e7c 100644
--- a/Makefile
+++ b/Makefile
@@ -96,8 +96,8 @@ api-docs: gen-crd-api-reference-docs
 
 # Run go mod tidy
 tidy:
-	cd api; rm -f go.sum; go mod tidy -compat=1.22
-	rm -f go.sum; go mod tidy -compat=1.22
+	cd api; rm -f go.sum; go mod tidy -compat=1.23
+	rm -f go.sum; go mod tidy -compat=1.23
 
 # Run go fmt against code
 fmt: