C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix condition on kata_containers_version/kube_version when kata_containers_enabled is false (#8804)

Browse source
This commit is contained in:
emiran-orange 2022-05-09 23:56:32 +02:00 committed by GitHub
parent 5296d7ef9c
commit 8f618ab408
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
View file

@ -248,7 +248,7 @@
You can set `etcd_deployment_type` to `kubeadm` instead of setting `etcd_kubeadm_enabled` to `true`." You can set `etcd_deployment_type` to `kubeadm` instead of setting `etcd_kubeadm_enabled` to `true`."
changed_when: true changed_when: true
- name: Stop if `etcd_kubeadm_enabled` is defined and `etcd_deployment_type` is not `kubadm` or `host` - name: Stop if `etcd_kubeadm_enabled` is defined and `etcd_deployment_type` is not `kubeadm` or `host`
assert: assert:
that: etcd_deployment_type == 'kubeadm' that: etcd_deployment_type == 'kubeadm'
msg: > msg: >
@ -274,7 +274,9 @@
assert: assert:
that: kube_version is version('v1.22.0', '>') that: kube_version is version('v1.22.0', '>')
msg: "Kata containers version 2.3.0 is compatible with Kubernetes 1.22.0+" msg: "Kata containers version 2.3.0 is compatible with Kubernetes 1.22.0+"
when: kata_containers_version is version ('2.3.0', '>=') when:
- kata_containers_enabled
- kata_containers_version is version ('2.3.0', '>=')
- name: Stop if gvisor_enabled is enabled when container_manager is not containerd - name: Stop if gvisor_enabled is enabled when container_manager is not containerd
assert: assert: