Add socat for CoreOS when using host deploy kubelet (#1575)
This commit is contained in:
parent
660282e82f
commit
fc7905653e
3 changed files with 18 additions and 1 deletions
|
@ -60,6 +60,8 @@ hyperkube_image_repo: "quay.io/coreos/hyperkube"
|
||||||
hyperkube_image_tag: "{{ kube_version }}_coreos.0"
|
hyperkube_image_tag: "{{ kube_version }}_coreos.0"
|
||||||
pod_infra_image_repo: "gcr.io/google_containers/pause-amd64"
|
pod_infra_image_repo: "gcr.io/google_containers/pause-amd64"
|
||||||
pod_infra_image_tag: "{{ pod_infra_version }}"
|
pod_infra_image_tag: "{{ pod_infra_version }}"
|
||||||
|
install_socat_image_repo: "xueshanf/install-socat"
|
||||||
|
install_socat_image_tag: "latest"
|
||||||
netcheck_version: "v1.0"
|
netcheck_version: "v1.0"
|
||||||
netcheck_agent_img_repo: "quay.io/l23network/k8s-netchecker-agent"
|
netcheck_agent_img_repo: "quay.io/l23network/k8s-netchecker-agent"
|
||||||
netcheck_agent_tag: "{{ netcheck_version }}"
|
netcheck_agent_tag: "{{ netcheck_version }}"
|
||||||
|
@ -194,6 +196,11 @@ downloads:
|
||||||
repo: "{{ pod_infra_image_repo }}"
|
repo: "{{ pod_infra_image_repo }}"
|
||||||
tag: "{{ pod_infra_image_tag }}"
|
tag: "{{ pod_infra_image_tag }}"
|
||||||
sha256: "{{ pod_infra_digest_checksum|default(None) }}"
|
sha256: "{{ pod_infra_digest_checksum|default(None) }}"
|
||||||
|
install_socat:
|
||||||
|
container: true
|
||||||
|
repo: "{{ install_socat_image_repo }}"
|
||||||
|
tag: "{{ install_socat_image_tag }}"
|
||||||
|
sha256: "{{ install_socat_digest_checksum|default(None) }}"
|
||||||
nginx:
|
nginx:
|
||||||
container: true
|
container: true
|
||||||
repo: "{{ nginx_image_repo }}"
|
repo: "{{ nginx_image_repo }}"
|
||||||
|
|
|
@ -6,6 +6,10 @@ dependencies:
|
||||||
- role: download
|
- role: download
|
||||||
file: "{{ downloads.pod_infra }}"
|
file: "{{ downloads.pod_infra }}"
|
||||||
tags: [download, kubelet]
|
tags: [download, kubelet]
|
||||||
|
- role: download
|
||||||
|
file: "{{ downloads.install_socat }}"
|
||||||
|
tags: [download, kubelet]
|
||||||
|
when: ansible_os_family in ['CoreOS', 'Container Linux by CoreOS']
|
||||||
- role: kubernetes/secrets
|
- role: kubernetes/secrets
|
||||||
tags: k8s-secrets
|
tags: k8s-secrets
|
||||||
- role: download
|
- role: download
|
||||||
|
@ -33,4 +37,4 @@ dependencies:
|
||||||
tags: [download, dnsmasq]
|
tags: [download, dnsmasq]
|
||||||
- role: download
|
- role: download
|
||||||
file: "{{ downloads.kubednsautoscaler }}"
|
file: "{{ downloads.kubednsautoscaler }}"
|
||||||
tags: [download, dnsmasq]
|
tags: [download, dnsmasq]
|
||||||
|
|
|
@ -8,3 +8,9 @@
|
||||||
changed_when: false
|
changed_when: false
|
||||||
tags: [hyperkube, upgrade]
|
tags: [hyperkube, upgrade]
|
||||||
notify: restart kubelet
|
notify: restart kubelet
|
||||||
|
|
||||||
|
- name: install | Copy socat wrapper for Container Linux
|
||||||
|
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 ['CoreOS', 'Container Linux by CoreOS']
|
||||||
|
|
Loading…
Reference in a new issue