From 85094433b123895b21f4144195241476679d5d47 Mon Sep 17 00:00:00 2001
From: kranurag7 <anurag.kumar@syself.com>
Date: Mon, 24 Jun 2024 18:02:16 +0530
Subject: [PATCH] sync helm version and remove format-yaml

Signed-off-by: kranurag7 <anurag.kumar@syself.com>
---
 .github/renovate/groups.json5 |  6 ++++++
 Makefile                      | 14 +-------------
 Tiltfile                      |  4 ++--
 images/builder/Dockerfile     |  8 ++------
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.github/renovate/groups.json5 b/.github/renovate/groups.json5
index 8447bd998..1145142fd 100644
--- a/.github/renovate/groups.json5
+++ b/.github/renovate/groups.json5
@@ -1,5 +1,11 @@
 {
   packageRules: [
+    {
+      "description": "disable helm image update",
+      "matchManagers": ["dockerfile"],
+      "matchDepNames": ["docker.io/alpine/helm"],
+      "enabled": false
+    },
     {
       description: "Update Builder Image",
       groupName: "Builder Image",
diff --git a/Makefile b/Makefile
index 09ad09331..dfc1b903d 100644
--- a/Makefile
+++ b/Makefile
@@ -405,18 +405,6 @@ else
 	GO111MODULE=on golangci-lint run -v --fix
 endif
 
-.PHONY: format-yaml
-format-yaml: ## Lint YAML files
-ifeq ($(BUILD_IN_CONTAINER),true)
-	docker run  --rm -t -i \
-		-v $(shell go env GOPATH)/pkg:/go/pkg$(MOUNT_FLAGS) \
-		-v $(shell pwd):/src/cluster-stack-operator$(MOUNT_FLAGS) \
-		$(BUILDER_IMAGE):$(BUILDER_IMAGE_VERSION) $@;
-else
-	yamlfixer --version
-	yamlfixer -c .yamllint.yaml .
-endif
-
 ##@ Lint
 ########
 # Lint #
@@ -502,7 +490,7 @@ endif
 lint: lint-golang lint-yaml lint-dockerfile lint-links ## Lint Codebase
 
 .PHONY: format
-format: format-golang format-yaml ## Format Codebase
+format: format-golang ## Format Codebase
 
 .PHONY: generate
 generate: generate-manifests generate-go-deepcopy generate-modules ## Generate Files
diff --git a/Tiltfile b/Tiltfile
index 2f884969b..f520a5fa6 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -114,7 +114,7 @@ def fixup_yaml_empty_arrays(yaml_str):
 ## This should have the same versions as the Dockerfile
 if settings.get("local_mode"):
     tilt_dockerfile_header_cso = """
-    FROM docker.io/alpine/helm:3.12.2 as helm
+    FROM docker.io/alpine/helm:3.15.1 as helm
 
     FROM docker.io/library/alpine:3.18.0 as tilt
     WORKDIR /
@@ -124,7 +124,7 @@ if settings.get("local_mode"):
     """
 else:
     tilt_dockerfile_header_cso = """
-    FROM docker.io/alpine/helm:3.12.2 as helm
+    FROM docker.io/alpine/helm:3.15.1 as helm
 
     FROM docker.io/library/alpine:3.18.0 as tilt
     WORKDIR /
diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile
index 722cd179a..167d5937f 100644
--- a/images/builder/Dockerfile
+++ b/images/builder/Dockerfile
@@ -32,9 +32,8 @@ RUN apk add --no-cache curl && \
 FROM cgr.dev/chainguard/wolfi-base:latest as wolfi
 
 # update: datasource=github-tags depName=kubernetes-sigs/cluster-api
-ARG CLUSTERCTL_VERSION="v1.6.2"
-# update: datasource=github-tags depName=helm/helm
-ENV HELM_VERSION="v3.14.1"
+ARG CLUSTERCTL_VERSION="v1.7.2"
+ENV HELM_VERSION="v3.15.1"
 # update: datasource=github-tags depName=kubernetes-sigs/kind
 ARG KIND_VERSION="v0.20.0"
 # update: datasource=github-tags depName=kubernetes/kubernetes
@@ -79,8 +78,6 @@ FROM docker.io/library/golang:1.21.6-bullseye
 
 # update: datasource=github-tags depName=adrienverge/yamllint versioning=semver
 ENV YAMLLINT_VERSION="v1.35.1"
-# update: datasource=github-tags depName=opt-nc/yamlfixer versioning=semver
-ENV YAMLFIXER_VERSION="0.9.15"
 
 # hadolint ignore=DL3008
 RUN apt-get update && \
@@ -91,7 +88,6 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     pip install --no-cache-dir \
     yamllint==${YAMLLINT_VERSION} \
-    yamlfixer-opt-nc==${YAMLFIXER_VERSION}
 
 COPY --from=wolfi /usr/bin/clusterctl /usr/bin/clusterctl
 COPY --from=wolfi /usr/bin/controller-gen /usr/bin/controller-gen