From a3d04b716431f7836c195c7838b068ec3b986f7a Mon Sep 17 00:00:00 2001
From: Yogeshwaran Rajendran <Yogeshwaran.Rajendran@silabs.com>
Date: Mon, 22 Jul 2024 11:11:51 +0530
Subject: [PATCH] fix(kubectl): load completion properly in functions

Closes #12427
---
 plugins/kubectl/kubectl.plugin.zsh | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index ad78fedeb..a96e409c6 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -180,23 +180,11 @@ alias kej='kubectl edit job'
 alias kdj='kubectl describe job'
 alias kdelj='kubectl delete job'
 
-# Utility print functions (json / yaml)
-function _build_kubectl_out_alias {
-  setopt localoptions norcexpandparam
-
-  # alias function
-  eval "function $1 { $2 }"
-
-  # completion function
-  eval "function _$1 {
-    words=(kubectl \"\${words[@]:1}\")
-    _kubectl
-  }"
-
-  compdef _$1 $1
-}
-
-_build_kubectl_out_alias "kj"  'kubectl "$@" -o json | jq'
-_build_kubectl_out_alias "kjx" 'kubectl "$@" -o json | fx'
-_build_kubectl_out_alias "ky"  'kubectl "$@" -o yaml | yh'
-unfunction _build_kubectl_out_alias
+function kj() { kubectl "$@" -o json | jq; }
+function kjx() { kubectl "$@" -o json | fx; }
+function ky() { kubectl "$@" -o yaml | yh; }
+if (( ${+functions[compdef]} )); then
+  compdef _kubectl kj
+  compdef _kubectl kjx
+  compdef _kubectl ky
+fi