Skip to content

Commit

Permalink
Add pre-upgrade task for moving credentials file (kubernetes-sigs#2394)
Browse files Browse the repository at this point in the history
* Add pre-upgrade task for moving credentials file

This reverts commit 7ef9f4d.

* add python interpreter workaround for localhost
  • Loading branch information
mattymo authored Apr 2, 2018
1 parent 92fc2df commit 3004791
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.vagrant
*.retry
inventory/vagrant_ansible_inventory
inventory/credentials/
inventory/group_vars/fake_hosts.yml
inventory/host_vars/
temp
Expand Down
2 changes: 0 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ before_script:
${SSH_ARGS}
${LOG_LEVEL}
-e @${CI_TEST_VARS}
-e ansible_python_interpreter=${PYPATH}
-e ansible_ssh_user=${SSH_USER}
-e local_release_dir=${PWD}/downloads
--limit "all:!fake_hosts"
Expand All @@ -129,7 +128,6 @@ before_script:
${SSH_ARGS}
${LOG_LEVEL}
-e @${CI_TEST_VARS}
-e ansible_python_interpreter=${PYPATH}
-e ansible_ssh_user=${SSH_USER}
-e local_release_dir=${PWD}/downloads
--limit "all:!fake_hosts"
Expand Down
5 changes: 5 additions & 0 deletions roles/kubernetes/preinstall/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
tags:
- asserts

# This is run before bin_dir is pinned because these tasks are run on localhost
- import_tasks: pre_upgrade.yml
tags:
- upgrade

- name: Force binaries directory for Container Linux by CoreOS
set_fact:
bin_dir: "/opt/bin"
Expand Down
28 changes: 28 additions & 0 deletions roles/kubernetes/preinstall/tasks/pre_upgrade.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
- name: "Pre-upgrade | check if old credential dir exists"
local_action:
module: stat
path: "{{ inventory_dir }}/../credentials"
vars:
ansible_python_interpreter: "/usr/bin/env python"
register: old_credential_dir
become: no

- name: "Pre-upgrade | check if new credential dir exists"
local_action:
module: stat
path: "{{ inventory_dir }}/credentials"
vars:
ansible_python_interpreter: "/usr/bin/env python"
register: new_credential_dir
become: no
when: old_credential_dir.stat.exists

- name: "Pre-upgrade | move data from old credential dir to new"
local_action: command mv {{ inventory_dir }}/../credentials {{ inventory_dir }}/credentials
args:
creates: "{{ inventory_dir }}/credentials"
vars:
ansible_python_interpreter: "/usr/bin/env python"
become: no
when: old_credential_dir.stat.exists and not new_credential_dir.stat.exists

0 comments on commit 3004791

Please sign in to comment.