diff --git a/roles/kubernetes-apps/helm/defaults/main.yml b/roles/kubernetes-apps/helm/defaults/main.yml new file mode 100644 index 00000000000..4e0bb27b217 --- /dev/null +++ b/roles/kubernetes-apps/helm/defaults/main.yml @@ -0,0 +1,4 @@ +--- +socat_mode: 0700 +socat_owner: kube +socat_dest: {{ bin_dir }} diff --git a/roles/kubernetes-apps/helm/files/socat b/roles/kubernetes-apps/helm/files/socat new file mode 100644 index 00000000000..ddb90978a0d Binary files /dev/null and b/roles/kubernetes-apps/helm/files/socat differ diff --git a/roles/kubernetes-apps/helm/tasks/main.yml b/roles/kubernetes-apps/helm/tasks/main.yml index edf2509d501..be4c496970d 100644 --- a/roles/kubernetes-apps/helm/tasks/main.yml +++ b/roles/kubernetes-apps/helm/tasks/main.yml @@ -1,3 +1,9 @@ --- -- debug: - msg: "No helm charts" +- name: "Helm | Copy socat binary to {{ kube_binaries_dir }}" + copy: + src: "{{ role_path }}/files/socat" + dest: "{{ socat_dest }}" + owner: {{ socat_owner }} + mode: {{ socat_mode }} + when: ansible_os_family == "Container Linux by CoreOS" and + kubelet_deployment_type == "docker" diff --git a/roles/kubernetes-apps/meta/main.yml b/roles/kubernetes-apps/meta/main.yml index f6df2626c2b..854749e3fbe 100644 --- a/roles/kubernetes-apps/meta/main.yml +++ b/roles/kubernetes-apps/meta/main.yml @@ -17,3 +17,4 @@ dependencies: - role: kubernetes-apps/efk when: efk_enabled tags: [ apps, efk ] + - {role: kubernetes-apps/helm, tags: [apps, helm]} diff --git a/roles/kubernetes/node/templates/kubelet-container.j2 b/roles/kubernetes/node/templates/kubelet-container.j2 index ffea01cec38..917c495bee8 100644 --- a/roles/kubernetes/node/templates/kubelet-container.j2 +++ b/roles/kubernetes/node/templates/kubelet-container.j2 @@ -23,6 +23,9 @@ -v /var/lib/kubelet:/var/lib/kubelet:shared \ -v /var/run:/var/run:rw \ -v {{kube_config_dir}}:{{kube_config_dir}}:ro \ + {% if ansible_os_family == "Container Linux by CoreOS" and kubelet_deployment_type == "docker" %} + -e PATH="$PATH:{{ socat_dest }}" \ + {% endif %} {{ hyperkube_image_repo }}:{{ hyperkube_image_tag}} \ ./hyperkube kubelet \ "$@"