diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index f075cc464..c566acd6b 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -167,6 +167,8 @@ contiv_ovs_image_repo: "contiv/ovs" contiv_ovs_image_tag: "latest" cilium_image_repo: "docker.io/cilium/cilium" cilium_image_tag: "{{ cilium_version }}" +cilium_init_image_repo: "docker.io/library/busybox" +cilium_init_image_tag: "1.28.4" kube_router_image_repo: "cloudnativelabs/kube-router" kube_router_image_tag: "{{ kube_router_version }}" multus_image_repo: "docker.io/nfvpe/multus" @@ -314,6 +316,15 @@ downloads: groups: - k8s-cluster + cilium_init: + enabled: "{{ kube_network_plugin == 'cilium' }}" + container: true + repo: "{{ cilium_init_image_repo }}" + tag: "{{ cilium_init_image_tag }}" + sha256: "{{ cilium_init_digest_checksum|default(None) }}" + groups: + - k8s-cluster + multus: enabled: "{{ kube_network_plugin_multus }}" container: true diff --git a/roles/kubernetes/master/defaults/main.yml b/roles/kubernetes/master/defaults/main.yml index e8d495884..c0fabcd42 100644 --- a/roles/kubernetes/master/defaults/main.yml +++ b/roles/kubernetes/master/defaults/main.yml @@ -127,7 +127,7 @@ kube_kubeadm_scheduler_extra_args: {} ## Extra control plane host volume mounts ## Example: -#apiserver_extra_volumes: +# apiserver_extra_volumes: # - name: name # hostPath: /host/path # mountPath: /mount/path diff --git a/roles/kubernetes/node/tasks/main.yml b/roles/kubernetes/node/tasks/main.yml index 840e8b9f5..41410cf70 100644 --- a/roles/kubernetes/node/tasks/main.yml +++ b/roles/kubernetes/node/tasks/main.yml @@ -116,7 +116,7 @@ modprobe: name: nf_conntrack state: present - when: + when: - enable_nf_conntrack is failed - kube_proxy_mode == 'ipvs' diff --git a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 b/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 index bda6000ae..21b167724 100755 --- a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 +++ b/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 @@ -32,7 +32,7 @@ spec: serviceAccountName: cilium initContainers: - name: clean-cilium-state - image: docker.io/library/busybox:1.28.4 + image: {{ cilium_init_image_repo }}:{{ cilium_init_image_tag }} imagePullPolicy: IfNotPresent command: ['sh', '-c', 'if [ "${CLEAN_CILIUM_STATE}" = "true" ]; then rm -rf /var/run/cilium/state; rm -rf /sys/fs/bpf/tc/globals/cilium_*; fi'] volumeMounts: