Merge pull request #3 from banksalad/coin-795

banksalad · Sep 7, 2023 · f4d8aa2 · f4d8aa2
2 parents 9a828a1 + f3c80d5
commit f4d8aa2
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 1 deletion.
diff --git a/helm/helm-chart-package.sh.tpl b/helm/helm-chart-package.sh.tpl
@@ -58,7 +58,7 @@ if [ -n $DIGEST_PATH ] && [ "$DIGEST_PATH" != "" ]; then
     IFS=':' read -ra digest_split <<< "$DIGEST"
     DIGEST_SHA=${digest_split[1]}
 
-    sha=$DIGEST_PATH {YQ_PATH} -i '.{VALUES_TAG_YAML_PATH} = env(sha)' {CHART_VALUES_PATH}
+    sha=$DIGEST_SHA {YQ_PATH} -i '.{VALUES_TAG_YAML_PATH} = env(sha)' {CHART_VALUES_PATH}
 
     echo "Replaced image tag in chart values.yaml with: $DIGEST_SHA"
 

diff --git a/repositories/helm_repositories.bzl b/repositories/helm_repositories.bzl
@@ -15,6 +15,13 @@ def helm_repositories():
     build_file = "@com_github_masmovil_bazel_rules//:helm.BUILD",
   )
 
+  http_archive(
+    name = "helm_v2.17.0_linux_arm64",
+    sha256 = "c3ebe8fa04b4e235eb7a9ab030a98d3002f93ecb842f0a8741f98383a9493d7f",
+    urls = ["https://get.helm.sh/helm-v2.17.0-linux-arm64.tar.gz"],
+    build_file = "@com_github_masmovil_bazel_rules//:helm.BUILD",
+  )
+
   http_archive(
     name = "helm_v3.12.2_darwin",
     sha256 = "6e8bfc84a640e0dc47cc49cfc2d0a482f011f4249e2dff2a7e23c7ef2df1b64e",

diff --git a/repositories/repositories.bzl b/repositories/repositories.bzl
@@ -31,6 +31,7 @@ def repositories():
     "@com_github_masmovil_bazel_rules//toolchains/yq:yq_osx_arm64_toolchain",
     "@com_github_masmovil_bazel_rules//toolchains/yq:yq_windows_toolchain",
     "@com_github_masmovil_bazel_rules//toolchains/helm:helm_v2.17.0_linux_toolchain",
+    "@com_github_masmovil_bazel_rules//toolchains/helm:helm_v2.17.0_linux_arm64_toolchain",
     "@com_github_masmovil_bazel_rules//toolchains/helm:helm_v2.17.0_osx_toolchain",
     "@com_github_masmovil_bazel_rules//toolchains/helm-3:helm_v3.12.2_linux_toolchain",
     "@com_github_masmovil_bazel_rules//toolchains/helm-3:helm_v3.12.2_linux_arm64_toolchain",

diff --git a/toolchains/helm/BUILD b/toolchains/helm/BUILD
@@ -19,6 +19,13 @@ helm_toolchain(
     visibility = ["//visibility:public"],
 )
 
+helm_toolchain(
+    name = "helm_v2.17.0_linux_arm64",
+    tool = "@helm_v2.17.0_linux_arm64//:helm",
+    helm_version = "2.17.0",
+    visibility = ["//visibility:public"],
+)
+
 toolchain(
     name = "helm_v2.17.0_linux_toolchain",
     exec_compatible_with = [
@@ -33,6 +40,20 @@ toolchain(
     toolchain_type = ":toolchain_type",
 )
 
+toolchain(
+    name = "helm_v2.17.0_linux_arm64_toolchain",
+    exec_compatible_with = [
+        "@platforms//os:linux",
+        "@platforms//cpu:arm64",
+    ],
+    target_compatible_with = [
+        "@platforms//os:linux",
+        "@platforms//cpu:arm64",
+    ],
+    toolchain = ":helm_v2.17.0_linux_arm64",
+    toolchain_type = ":toolchain_type",
+)
+
 toolchain(
     name = "helm_v2.17.0_osx_toolchain",
     target_compatible_with = [

diff --git a/toolchains/kubectl/BUILD b/toolchains/kubectl/BUILD
@@ -11,12 +11,24 @@ kubectl_toolchain(
     visibility = ["//visibility:public"],
 )
 
+kubectl_toolchain(
+    name = "kubectl_darwin_arm64",
+    tool = "@kubectl_darwin_arm64//file",
+    visibility = ["//visibility:public"],
+)
+
 kubectl_toolchain(
     name = "kubectl_linux",
     tool = "@kubectl_linux//file",
     visibility = ["//visibility:public"],
 )
 
+kubectl_toolchain(
+    name = "kubectl_linux_arm64",
+    tool = "@kubectl_linux_arm64//file",
+    visibility = ["//visibility:public"],
+)
+
 toolchain(
     name = "kubectl_linux_toolchain",
     exec_compatible_with = [