From 667a6981ea47c9e9742f21e24114253fd02a5084 Mon Sep 17 00:00:00 2001
From: Etienne Champetier <champetier.etienne@gmail.com>
Date: Sat, 9 Jan 2021 17:12:18 -0500
Subject: [PATCH] preinstall: remove credentials folder move

This was introduced in 3004791c6469181a83d80971110813a3cd3ce658,
so since 2018 everyone should be upgraded ;)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
---
 .../preinstall/tasks/0030-pre_upgrade.yml     | 28 -------------------
 roles/kubernetes/preinstall/tasks/main.yml    |  8 ------
 2 files changed, 36 deletions(-)
 delete mode 100644 roles/kubernetes/preinstall/tasks/0030-pre_upgrade.yml

diff --git a/roles/kubernetes/preinstall/tasks/0030-pre_upgrade.yml b/roles/kubernetes/preinstall/tasks/0030-pre_upgrade.yml
deleted file mode 100644
index 62a863808..000000000
--- a/roles/kubernetes/preinstall/tasks/0030-pre_upgrade.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: "Pre-upgrade | check if old credential dir exists"
-  stat:
-    path: "{{ inventory_dir }}/../credentials"
-  delegate_to: localhost
-  connection: local
-  register: old_credential_dir
-  become: no
-
-- name: "Pre-upgrade | check if new credential dir exists"
-  stat:
-    path: "{{ inventory_dir }}/credentials"
-  delegate_to: localhost
-  connection: local
-  register: new_credential_dir
-  become: no
-  when: old_credential_dir.stat.exists
-
-- name: "Pre-upgrade | move data from old credential dir to new"
-  command: mv {{ inventory_dir }}/../credentials {{ inventory_dir }}/credentials
-  args:
-    creates: "{{ inventory_dir }}/credentials"
-  delegate_to: localhost
-  connection: local
-  become: no
-  when:
-    - old_credential_dir.stat.exists
-    - not new_credential_dir.stat.exists
diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index d1b1b112d..69a21ed13 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -11,14 +11,6 @@
   tags:
     - asserts
 
-# This is run before bin_dir is pinned because these tasks are run on localhost
-- import_tasks: 0030-pre_upgrade.yml
-  run_once: true
-  when:
-    - not dns_late
-  tags:
-    - upgrade
-
 - import_tasks: 0040-set_facts.yml
   tags:
     - resolvconf