diff --git a/README.md b/README.md index a3a04f790998d473fd11ec15d4a6a57d106cb6f5..1f2e3e04ac3b5fc59416320d1634d0138f1e8caa 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,14 @@ For windows users, download the latest archive from the [release page](https://g While convenient, creating pod before debugging can be time consuming. You can install the debug agent DaemonSet in advance to skip this: ```bash +# if your kubernetes version is v1.16 or newer kubectl apply -f https://raw.githubusercontent.com/aylei/kubectl-debug/master/scripts/agent_daemonset.yml +# if your kubernetes is old version(<v1.16), you should change the apiVersion to extensions/v1beta1, As follows +wget https://raw.githubusercontent.com/aylei/kubectl-debug/master/scripts/agent_daemonset.yml +sed -i '' '1s/apps\/v1/extensions\/v1beta1/g' agent_daemonset.yml +kubectl apply -f agent_daemonset.yml # or using helm -helm install -n=debug-agent ./contrib/helm/kubectl-debug +helm install kubectl-debug -n=debug-agent ./contrib/helm/kubectl-debug ``` ## Debug instructions diff --git a/contrib/helm/kubectl-debug/templates/agent-ds.yaml b/contrib/helm/kubectl-debug/templates/agent-ds.yaml index a7a8bc4985d48795c80eec7d304a03f2a88dde93..ca8bacb5a7586ffa9a33d83950c523bd62762311 100644 --- a/contrib/helm/kubectl-debug/templates/agent-ds.yaml +++ b/contrib/helm/kubectl-debug/templates/agent-ds.yaml @@ -1,4 +1,8 @@ +{{- if ge .Capabilities.KubeVersion.Minor "16" }} +apiVersion: apps/v1 +{{- else }} apiVersion: extensions/v1beta1 +{{- end }} kind: DaemonSet metadata: name: {{ template "kubectl-debug.fullname" . }}-agent diff --git a/docs/zh-cn.md b/docs/zh-cn.md index a847a3f8146f5eb860bcc4897976da86e8711072..5c098b2ce3c43d8302b70ba4c273d9edb09684c8 100644 --- a/docs/zh-cn.md +++ b/docs/zh-cn.md @@ -58,9 +58,14 @@ Windows 鐢ㄦ埛鍙互浠� [release page](https://github.com/aylei/kubectl-debug/re `agentless` 铏界劧鏂逛究, 浣嗕細璁� debug 鐨勫惎鍔ㄩ€熷害鏄捐憲涓嬮檷, 浣犲彲浠ラ€氳繃棰勫厛瀹夎 debug-agent 鐨� DaemonSet 鏉ヤ娇鐢� agent 妯″紡, 鍔犲揩鍚姩閫熷害: ```bash +# 濡傛灉浣犵殑kubernetes鐗堟湰涓簐1.16鎴栨洿楂� kubectl apply -f https://raw.githubusercontent.com/aylei/kubectl-debug/master/scripts/agent_daemonset.yml -# 鎴栬€呬娇鐢� helm 瀹夎 -helm install -n=debug-agent ./contrib/helm/kubectl-debug +# 濡傛灉浣犱娇鐢ㄧ殑鏄棫鐗堟湰鐨刱ubernetes(<v1.16), 浣犻渶瑕佸厛灏哸piVersion淇敼涓篹xtensions/v1beta1, 鍙互濡備笅鎿嶄綔 +wget https://raw.githubusercontent.com/aylei/kubectl-debug/master/scripts/agent_daemonset.yml +sed -i '' '1s/apps\/v1/extensions\/v1beta1/g' agent_daemonset.yml +kubectl apply -f agent_daemonset.yml +# 鎴栬€呬娇鐢╤elm瀹夎 +helm install kubectl-debug -n=debug-agent ./contrib/helm/kubectl-debug ``` 绠€鍗曚娇鐢�: diff --git a/scripts/agent_daemonset.yml b/scripts/agent_daemonset.yml index 41a4cac367791482d638ea84731759956a7dcbac..9d796beb39238f9d50fa1e5f1acf58a81323a763 100644 --- a/scripts/agent_daemonset.yml +++ b/scripts/agent_daemonset.yml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: labels: