From e8163a99658eccdbb56aef800f6ea388477f6589 Mon Sep 17 00:00:00 2001
From: pycgo <55949132+pycgo@users.noreply.github.com>
Date: Fri, 5 Jan 2024 16:33:21 +0800
Subject: [PATCH 1/4] delele cpu limit

---
 kubectl-node_shell | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kubectl-node_shell b/kubectl-node_shell
index 7e99184..7164339 100755
--- a/kubectl-node_shell
+++ b/kubectl-node_shell
@@ -7,7 +7,6 @@ generator=""
 node=""
 nodefaultctx=0
 nodefaultns=0
-container_cpu="${KUBECTL_NODE_SHELL_POD_CPU:-100m}"
 container_memory="${KUBECTL_NODE_SHELL_POD_MEMORY:-256Mi}"
 volumes="[]"
 volume_mounts="[]"
@@ -157,8 +156,8 @@ cat <<EOT
         "tty": $tty,
         "command": $cmd,
         "resources": {
-          "limits":   { "cpu": "${container_cpu}", "memory": "${container_memory}" },
-          "requests": { "cpu": "${container_cpu}", "memory": "${container_memory}" }
+          "limits":   { "memory": "${container_memory}" },
+          "requests": { "memory": "${container_memory}" }
         },
         "volumeMounts": $volume_mounts
       }

From 2b4df33a27af6d9067ad09b605e57e81e76557fc Mon Sep 17 00:00:00 2001
From: pycgo <55949132+pycgo@users.noreply.github.com>
Date: Wed, 17 Jan 2024 18:12:42 +0800
Subject: [PATCH 2/4] Update kubectl-node_shell

---
 kubectl-node_shell | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/kubectl-node_shell b/kubectl-node_shell
index 7164339..bfe3b4d 100755
--- a/kubectl-node_shell
+++ b/kubectl-node_shell
@@ -7,6 +7,7 @@ generator=""
 node=""
 nodefaultctx=0
 nodefaultns=0
+container_cpu="${KUBECTL_NODE_SHELL_POD_CPU:-100m}"
 container_memory="${KUBECTL_NODE_SHELL_POD_MEMORY:-256Mi}"
 volumes="[]"
 volume_mounts="[]"
@@ -139,6 +140,20 @@ else
   fi
 fi
 
+# test if resource specification is required
+set +e
+$kubectl run test --image test --dry-run=server 2>&1|grep forbidden --quiet
+if [ $? -eq 0 ];then
+  resources_json='"resources": {
+          "limits":   { "cpu": "'${container_cpu}'", "memory": "'${container_memory}'" },
+          "requests": { "cpu": "'${container_cpu}'", "memory": "'${container_memory}'" }
+        }'
+else
+  resources_json='"resources": {}'
+
+fi
+set -e
+
 overrides="$(
 cat <<EOT
 {
@@ -155,10 +170,7 @@ cat <<EOT
         "stdinOnce": true,
         "tty": $tty,
         "command": $cmd,
-        "resources": {
-          "limits":   { "memory": "${container_memory}" },
-          "requests": { "memory": "${container_memory}" }
-        },
+        $resources_json,
         "volumeMounts": $volume_mounts
       }
     ],
@@ -171,7 +183,6 @@ cat <<EOT
 }
 EOT
 )"
-
 # Support Kubectl <1.18
 m=$(kubectl version --client -o yaml | awk -F'[ :"]+' '$2 == "minor" {print $3+0}')
 if [ "$m" -lt 18 ]; then

From a2ea0cb731fefbae9d2b2864a3995d12802fac90 Mon Sep 17 00:00:00 2001
From: pycgo <55949132+pycgo@users.noreply.github.com>
Date: Thu, 18 Jan 2024 09:57:58 +0800
Subject: [PATCH 3/4] change grep message

Co-authored-by: Andrei Kvapil <kvapss@gmail.com>
---
 kubectl-node_shell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubectl-node_shell b/kubectl-node_shell
index bfe3b4d..f5e3f58 100755
--- a/kubectl-node_shell
+++ b/kubectl-node_shell
@@ -142,7 +142,7 @@ fi
 
 # test if resource specification is required
 set +e
-$kubectl run test --image test --dry-run=server 2>&1|grep forbidden --quiet
+$kubectl run test --image test --dry-run=server 2>&1 | grep 'failed quota' --quiet
 if [ $? -eq 0 ];then
   resources_json='"resources": {
           "limits":   { "cpu": "'${container_cpu}'", "memory": "'${container_memory}'" },

From 457fce0a0cdd82ca9ff7a5b1fbed13315d9de2e1 Mon Sep 17 00:00:00 2001
From: pycgo <55949132+pycgo@users.noreply.github.com>
Date: Thu, 18 Jan 2024 10:13:08 +0800
Subject: [PATCH 4/4] set resource if or not depend on k8s quota

---
 kubectl-node_shell | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/kubectl-node_shell b/kubectl-node_shell
index f5e3f58..80f7a1e 100755
--- a/kubectl-node_shell
+++ b/kubectl-node_shell
@@ -141,18 +141,11 @@ else
 fi
 
 # test if resource specification is required
-set +e
-$kubectl run test --image test --dry-run=server 2>&1 | grep 'failed quota' --quiet
-if [ $? -eq 0 ];then
-  resources_json='"resources": {
+resources_json='"resources": {
           "limits":   { "cpu": "'${container_cpu}'", "memory": "'${container_memory}'" },
           "requests": { "cpu": "'${container_cpu}'", "memory": "'${container_memory}'" }
         }'
-else
-  resources_json='"resources": {}'
-
-fi
-set -e
+$kubectl run test --image test --dry-run=server 2>&1 | grep 'failed quota' --quiet || resources_json='"resources": {}'
 
 overrides="$(
 cat <<EOT