Browse Source

Switch /root references to ansible_env.HOME (#4842)

* kube config dir for current/ansible become user

* remove extra /

* fix default value
pull/4849/head
mervynzhang 5 years ago
committed by Kubernetes Prow Robot
parent
commit
a8dfcbbfc7
6 changed files with 11 additions and 11 deletions
  1. 2
      roles/kubernetes-apps/helm/templates/helm-container.j2
  2. 8
      roles/kubernetes/client/tasks/main.yml
  3. 2
      roles/kubernetes/master/handlers/main.yml
  4. 2
      roles/kubernetes/master/tasks/kubeadm-cleanup-old-certs.yml
  5. 4
      roles/recover_control_plane/master/tasks/main.yml
  6. 4
      roles/reset/tasks/main.yml

2
roles/kubernetes-apps/helm/templates/helm-container.j2

@ -2,7 +2,7 @@
{{ docker_bin_dir }}/docker run --rm \
--net=host \
--name=helm \
-v /root/.kube:/root/.kube:ro \
-v {{ ansible_env.HOME | default('/root') }}/.kube:/root/.kube:ro \
-v /etc/ssl:/etc/ssl:ro \
-v {{ helm_home_dir }}:{{ helm_home_dir }}:rw \
{% for dir in ssl_ca_dirs -%}

8
roles/kubernetes/client/tasks/main.yml

@ -16,16 +16,16 @@
tags:
- facts
- name: Create kube config dir
- name: Create kube config dir for current/ansible become user
file:
path: "/root/.kube"
path: "{{ ansible_env.HOME | default('/root') }}/.kube"
mode: "0700"
state: directory
- name: Copy admin kubeconfig to root user home
- name: Copy admin kubeconfig to current/ansible become user home
copy:
src: "{{ kube_config_dir }}/admin.conf"
dest: "/root/.kube/config"
dest: "{{ ansible_env.HOME | default('/root') }}/.kube/config"
remote_src: yes
mode: "0600"
backup: yes

2
roles/kubernetes/master/handlers/main.yml

@ -101,7 +101,7 @@
- name: Master | Copy new kubeconfig for root user
copy:
src: "{{ kube_config_dir }}/admin.conf"
dest: "/root/.kube/config"
dest: "{{ ansible_env.HOME | default('/root') }}/.kube/config"
remote_src: yes
mode: "0600"
backup: yes

2
roles/kubernetes/master/tasks/kubeadm-cleanup-old-certs.yml

@ -13,5 +13,5 @@
- name: kubeadm | Purge old kubeconfig
file:
path: /root/.kube/config
path: "{{ ansible_env.HOME | default('/root') }}/.kube/config"
state: absent

4
roles/recover_control_plane/master/tasks/main.yml

@ -2,7 +2,7 @@
- name: Wait for apiserver
shell: "{{ bin_dir }}/kubectl get nodes"
environment:
- KUBECONFIG: /root/.kube/config
- KUBECONFIG: "{{ ansible_env.HOME | default('/root') }}/.kube/config"
register: apiserver_is_ready
until: apiserver_is_ready.rc == 0
retries: 6
@ -12,7 +12,7 @@
- name: Delete old kube-master nodes from cluster
shell: "{{ bin_dir }}/kubectl delete node {{ item }}"
environment:
- KUBECONFIG: /root/.kube/config
- KUBECONFIG: "{{ ansible_env.HOME | default('/root') }}/.kube/config"
with_items: "{{ old_kube_masters.split(',') }}"
register: delete_old_kube_masters
failed_when: false

4
roles/reset/tasks/main.yml

@ -172,8 +172,8 @@
with_items:
- "{{ kube_config_dir }}"
- /var/lib/kubelet
- /root/.kube
- /root/.helm
- "{{ ansible_env.HOME | default('/root') }}/.kube"
- "{{ ansible_env.HOME | default('/root') }}/.helm"
- "{{ etcd_data_dir }}"
- /var/lib/etcd-events
- /etc/ssl/etcd

Loading…
Cancel
Save