Ho Kim
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
0 additions and
35 deletions
-
roles/download/defaults/main.yml
-
roles/kubernetes/node/tasks/install.yml
|
|
@ -949,8 +949,6 @@ calico_apiserver_image_repo: "{{ quay_image_repo }}/calico/apiserver" |
|
|
|
calico_apiserver_image_tag: "{{ calico_apiserver_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}" |
|
|
|
pod_infra_image_repo: "{{ kube_image_repo }}/pause" |
|
|
|
pod_infra_image_tag: "{{ pod_infra_version }}" |
|
|
|
install_socat_image_repo: "{{ docker_image_repo }}/xueshanf/install-socat" |
|
|
|
install_socat_image_tag: "latest" |
|
|
|
netcheck_version: "v1.2.2" |
|
|
|
netcheck_agent_image_repo: "{{ docker_image_repo }}/mirantis/k8s-netchecker-agent" |
|
|
|
netcheck_agent_image_tag: "{{ netcheck_version }}" |
|
|
@ -1496,15 +1494,6 @@ downloads: |
|
|
|
groups: |
|
|
|
- k8s_cluster |
|
|
|
|
|
|
|
install_socat: |
|
|
|
enabled: "{{ ansible_os_family in ['Flatcar', 'Flatcar Container Linux by Kinvolk'] }}" |
|
|
|
container: true |
|
|
|
repo: "{{ install_socat_image_repo }}" |
|
|
|
tag: "{{ install_socat_image_tag }}" |
|
|
|
sha256: "{{ install_socat_digest_checksum|default(None) }}" |
|
|
|
groups: |
|
|
|
- k8s_cluster |
|
|
|
|
|
|
|
kube-vip: |
|
|
|
enabled: "{{ kube_vip_enabled }}" |
|
|
|
container: true |
|
|
|
|
|
@ -20,27 +20,3 @@ |
|
|
|
- kubelet |
|
|
|
- upgrade |
|
|
|
notify: Node | restart kubelet |
|
|
|
|
|
|
|
- name: install | Copy socat wrapper for Container Linux with Docker |
|
|
|
command: "{{ docker_bin_dir }}/docker run --rm -v {{ bin_dir }}:/opt/bin {{ install_socat_image_repo }}:{{ install_socat_image_tag }}" |
|
|
|
args: |
|
|
|
creates: "{{ bin_dir }}/socat" |
|
|
|
when: |
|
|
|
- ansible_os_family in ['Flatcar', 'Flatcar Container Linux by Kinvolk'] |
|
|
|
- container_manager == "docker" |
|
|
|
|
|
|
|
- name: install | Copy socat wrapper for Container Linux with Containerd |
|
|
|
command: "{{ containerd_bin_dir }}/ctr --namespace k8s.io run --rm --mount type=bind,src={{ bin_dir }},dst=/opt/bin,options=rbind:rw {{ install_socat_image_repo }}:{{ install_socat_image_tag }} copysocat" |
|
|
|
args: |
|
|
|
creates: "{{ bin_dir }}/socat" |
|
|
|
when: |
|
|
|
- ansible_os_family in ['Flatcar', 'Flatcar Container Linux by Kinvolk'] |
|
|
|
- container_manager == "containerd" |
|
|
|
|
|
|
|
- name: install | Copy socat wrapper for Container Linux with crio |
|
|
|
command: "podman run --rm --mount type=bind,source={{ bin_dir }},destination=/opt/bin,rw=true {{ install_socat_image_repo }}:{{ install_socat_image_tag }}" |
|
|
|
args: |
|
|
|
creates: "{{ bin_dir }}/socat" |
|
|
|
when: |
|
|
|
- ansible_os_family in ['Flatcar', 'Flatcar Container Linux by Kinvolk'] |
|
|
|
- container_manager == "crio" |