mirror of
https://github.com/kubesphere/kubekey.git
synced 2025-12-25 17:12:50 +00:00
fix: some failed version check when create cluster (#2877)
* fix: runc version check failed Signed-off-by: William Wang <williamw0825@gmail.com> * fix: kubectl version check failed Signed-off-by: William Wang <williamw0825@gmail.com> * fix: helm version check failed Signed-off-by: William Wang <williamw0825@gmail.com> * fix: use .kube_version in capkk task Signed-off-by: William Wang <williamw0825@gmail.com> * fix: helm version check in capkk Signed-off-by: William Wang <williamw0825@gmail.com> --------- Signed-off-by: William Wang <williamw0825@gmail.com>
This commit is contained in:
parent
86dbf89026
commit
67fd6098c1
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
- name: Check if helm is installed
|
||||
ignore_errors: true
|
||||
command: helm version --template "{{ .Version }}"
|
||||
command: helm version --template "{{ "{{" }} .Version {{ "}}" }}"
|
||||
register: helm_install_version
|
||||
- name: Install helm
|
||||
when: or (.helm_install_version.error | empty | not) (.helm_install_version.stdout | ne .helm_version)
|
||||
|
|
@ -30,12 +30,17 @@
|
|||
|
||||
- name: Check if kubectl is installed
|
||||
ignore_errors: true
|
||||
command: kubectl version --short
|
||||
command: |
|
||||
{{- if .kube_version | semverCompare ">=v1.28.0" -}}
|
||||
kubectl version --client
|
||||
{{- else -}}
|
||||
kubectl version --client --short
|
||||
{{- end -}}
|
||||
register: kubectl_install_version
|
||||
register_type: yaml
|
||||
- name: Sync kubectl to remote
|
||||
when: |
|
||||
or (.kubectl_install_version.error | empty | not) ((get .kubectl_install_version.stdout "Server Version") | ne .kube_version)
|
||||
or (.kubectl_install_version.error | empty | not) ((get .kubectl_install_version.stdout "Client Version") | ne .kube_version)
|
||||
copy:
|
||||
src: >-
|
||||
{{ .binary_dir }}/kube/{{ .kube_version }}/{{ .binary_type }}/kubectl
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
register: runc_install_version
|
||||
|
||||
- name: Containerd | Ensure the runc binary is present on the remote node
|
||||
when: or (.runc_install_version.error | empty | not) (.runc_install_version.stdout | contains (printf "runc version %s\n" (.cri.runc_version | default "" | trimPrefix "v" )) | not)
|
||||
when: or (.runc_install_version.error | empty | not) (.runc_install_version.stdout | regexMatch (printf "runc version %s\\s+" (.cri.runc_version | default "" | trimPrefix "v" )) | not)
|
||||
copy:
|
||||
src: >-
|
||||
{{ .binary_dir }}/runc/{{ .cri.runc_version }}/{{ .binary_type }}/runc.{{ .binary_type }}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
- name: Binary | Verify if Helm is already installed
|
||||
ignore_errors: true
|
||||
command: helm version --template "{{ .Version }}"
|
||||
command: helm version --template "{{ "{{" }} .Version {{ "}}" }}"
|
||||
register: helm_install_version
|
||||
|
||||
- name: Binary | Install Helm if not present or version mismatch
|
||||
|
|
@ -32,13 +32,18 @@
|
|||
|
||||
- name: Binary | Check if kubectl is installed
|
||||
ignore_errors: true
|
||||
command: kubectl version --short
|
||||
command: |
|
||||
{{- if .kubernetes.kube_version | semverCompare ">=v1.28.0" -}}
|
||||
kubectl version --client
|
||||
{{- else -}}
|
||||
kubectl version --client --short
|
||||
{{- end -}}
|
||||
register: kubectl_install_version
|
||||
register_type: yaml
|
||||
|
||||
- name: Binary | Install kubectl if not present or version mismatch
|
||||
when: |
|
||||
or (.kubectl_install_version.error | empty | not) ((get .kubectl_install_version.stdout "Server Version") | ne .kubernetes.kube_version)
|
||||
or (.kubectl_install_version.error | empty | not) ((get .kubectl_install_version.stdout "Client Version") | ne .kubernetes.kube_version)
|
||||
copy:
|
||||
src: >-
|
||||
{{ .binary_dir }}/kube/{{ .kubernetes.kube_version }}/{{ .binary_type }}/kubectl
|
||||
|
|
|
|||
|
|
@ -294,6 +294,14 @@ func TestParseValue(t *testing.T) {
|
|||
},
|
||||
excepted: []byte("bar"),
|
||||
},
|
||||
{
|
||||
name: "{{ & }} character translation",
|
||||
input: "helm version --template \"{{ \"{{\" }} .Version {{ \"}}\" }}\"",
|
||||
variable: map[string]any{
|
||||
"foo": "bar",
|
||||
},
|
||||
excepted: []byte("helm version --template \"{{ .Version }}\""),
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testcases {
|
||||
|
|
|
|||
Loading…
Reference in New Issue