add vars for cilium init container (#3893)
* add vars for cilium init container * make yamllint happy * add var cilium_init in downloads
This commit is contained in:
parent
4a7f829ecf
commit
30a9149b52
4 changed files with 14 additions and 3 deletions
|
@ -167,6 +167,8 @@ contiv_ovs_image_repo: "contiv/ovs"
|
||||||
contiv_ovs_image_tag: "latest"
|
contiv_ovs_image_tag: "latest"
|
||||||
cilium_image_repo: "docker.io/cilium/cilium"
|
cilium_image_repo: "docker.io/cilium/cilium"
|
||||||
cilium_image_tag: "{{ cilium_version }}"
|
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_repo: "cloudnativelabs/kube-router"
|
||||||
kube_router_image_tag: "{{ kube_router_version }}"
|
kube_router_image_tag: "{{ kube_router_version }}"
|
||||||
multus_image_repo: "docker.io/nfvpe/multus"
|
multus_image_repo: "docker.io/nfvpe/multus"
|
||||||
|
@ -314,6 +316,15 @@ downloads:
|
||||||
groups:
|
groups:
|
||||||
- k8s-cluster
|
- 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:
|
multus:
|
||||||
enabled: "{{ kube_network_plugin_multus }}"
|
enabled: "{{ kube_network_plugin_multus }}"
|
||||||
container: true
|
container: true
|
||||||
|
|
|
@ -127,7 +127,7 @@ kube_kubeadm_scheduler_extra_args: {}
|
||||||
|
|
||||||
## Extra control plane host volume mounts
|
## Extra control plane host volume mounts
|
||||||
## Example:
|
## Example:
|
||||||
#apiserver_extra_volumes:
|
# apiserver_extra_volumes:
|
||||||
# - name: name
|
# - name: name
|
||||||
# hostPath: /host/path
|
# hostPath: /host/path
|
||||||
# mountPath: /mount/path
|
# mountPath: /mount/path
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
modprobe:
|
modprobe:
|
||||||
name: nf_conntrack
|
name: nf_conntrack
|
||||||
state: present
|
state: present
|
||||||
when:
|
when:
|
||||||
- enable_nf_conntrack is failed
|
- enable_nf_conntrack is failed
|
||||||
- kube_proxy_mode == 'ipvs'
|
- kube_proxy_mode == 'ipvs'
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ spec:
|
||||||
serviceAccountName: cilium
|
serviceAccountName: cilium
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: clean-cilium-state
|
- name: clean-cilium-state
|
||||||
image: docker.io/library/busybox:1.28.4
|
image: {{ cilium_init_image_repo }}:{{ cilium_init_image_tag }}
|
||||||
imagePullPolicy: IfNotPresent
|
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']
|
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:
|
volumeMounts:
|
||||||
|
|
Loading…
Reference in a new issue