From 64268c43a1cb7ae4689019fce472e1f1b6487f77 Mon Sep 17 00:00:00 2001
From: Lomesh Patel <453290+lomeshpatel@users.noreply.github.com>
Date: Mon, 16 May 2022 15:18:28 -0400
Subject: [PATCH] Added toolchain support for Apple M1 and made toolchain_type
 public to allow extensions (#697)

---
 k8s/k8s.bzl              |  3 ++-
 toolchains/kubectl/BUILD | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/k8s/k8s.bzl b/k8s/k8s.bzl
index d2a01450..3e9471ef 100644
--- a/k8s/k8s.bzl
+++ b/k8s/k8s.bzl
@@ -62,7 +62,8 @@ def k8s_repositories():
         "@io_bazel_rules_k8s//toolchains/kubectl:kubectl_linux_amd64_toolchain",
         "@io_bazel_rules_k8s//toolchains/kubectl:kubectl_linux_arm64_toolchain",
         "@io_bazel_rules_k8s//toolchains/kubectl:kubectl_linux_s390x_toolchain",
-        "@io_bazel_rules_k8s//toolchains/kubectl:kubectl_osx_toolchain",
+        "@io_bazel_rules_k8s//toolchains/kubectl:kubectl_macos_x86_64_toolchain",
+        "@io_bazel_rules_k8s//toolchains/kubectl:kubectl_macos_arm64_toolchain",
         "@io_bazel_rules_k8s//toolchains/kubectl:kubectl_windows_toolchain",
     )
 
diff --git a/toolchains/kubectl/BUILD b/toolchains/kubectl/BUILD
index ba7edf30..054c019d 100644
--- a/toolchains/kubectl/BUILD
+++ b/toolchains/kubectl/BUILD
@@ -14,7 +14,7 @@
 
 load(":kubectl_toolchain.bzl", "kubectl_toolchain")
 
-package(default_visibility = ["//visibility:private"])
+package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
 
@@ -63,15 +63,30 @@ toolchain(
 )
 
 toolchain(
-    name = "kubectl_osx_toolchain",
+    name = "kubectl_macos_x86_64_toolchain",
     target_compatible_with = [
-        "@platforms//os:osx",
+        "@platforms//os:macos",
         "@platforms//cpu:x86_64",
     ],
     toolchain = "@k8s_config//:toolchain",
     toolchain_type = ":toolchain_type",
 )
 
+alias(
+    name = "kubectl_osx_toolchain",
+    actual = ":kubectl_macos_x86_64_toolchain",
+)
+
+toolchain(
+    name = "kubectl_macos_arm64_toolchain",
+    target_compatible_with = [
+        "@platforms//os:macos",
+        "@platforms//cpu:arm64",
+    ],
+    toolchain = "@k8s_config//:toolchain",
+    toolchain_type = ":toolchain_type",
+)
+
 toolchain(
     name = "kubectl_windows_toolchain",
     target_compatible_with = [