From 0850bd7225e6f3339797aea6b3710b5c0146091b Mon Sep 17 00:00:00 2001
From: Romil Bhardwaj <romil.bhardwaj@gmail.com>
Date: Thu, 22 Aug 2024 13:31:02 -0700
Subject: [PATCH 1/2] fix kubeconfig generate script

---
 sky/utils/kubernetes/generate_kubeconfig.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sky/utils/kubernetes/generate_kubeconfig.sh b/sky/utils/kubernetes/generate_kubeconfig.sh
index 04ea567d3f2..55f09720b67 100755
--- a/sky/utils/kubernetes/generate_kubeconfig.sh
+++ b/sky/utils/kubernetes/generate_kubeconfig.sh
@@ -169,6 +169,9 @@ roleRef:
   kind: Role
   name: skypilot-system-service-account-role
   apiGroup: rbac.authorization.k8s.io
+EOF
+# Apply optional ingress-related roles, but don't make the script fail if it fails
+kubectl apply -f - <<EOF || true
 ---
 # Optional: Role for accessing ingress resources
 apiVersion: rbac.authorization.k8s.io/v1

From 3b076852192649c83250ef905142b2af1c58f4e8 Mon Sep 17 00:00:00 2001
From: Romil Bhardwaj <romil.bhardwaj@gmail.com>
Date: Fri, 6 Sep 2024 11:11:52 -0700
Subject: [PATCH 2/2] updates

---
 sky/utils/kubernetes/generate_kubeconfig.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sky/utils/kubernetes/generate_kubeconfig.sh b/sky/utils/kubernetes/generate_kubeconfig.sh
index 55f09720b67..8923df9c051 100755
--- a/sky/utils/kubernetes/generate_kubeconfig.sh
+++ b/sky/utils/kubernetes/generate_kubeconfig.sh
@@ -171,8 +171,7 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
 EOF
 # Apply optional ingress-related roles, but don't make the script fail if it fails
-kubectl apply -f - <<EOF || true
----
+kubectl apply -f - <<EOF || echo "Failed to apply optional ingress-related roles. Nginx ingress is likely not installed. This is not critical and the script will continue."
 # Optional: Role for accessing ingress resources
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role