Purge old upgrade hooks and unused tasks (#1641)

roles/kubernetes/master/tasks/main.yml

@@ -85,6 +85,3 @@
     dest: "{{ kube_manifest_dir }}/kube-controller-manager.manifest"
   notify: Master | wait for kube-controller-manager
   tags: kube-controller-manager
-
-- include: post-upgrade.yml
-  tags: k8s-post-upgrade

roles/kubernetes/master/tasks/post-upgrade.yml

@@ -1,31 +0,0 @@
----
-- name: "Post-upgrade | stop kubelet on all masters"
-  service:
-    name: kubelet
-    state: stopped
-  delegate_to: "{{item}}"
-  with_items: "{{groups['kube-master']}}"
-  when: needs_etcd_migration|bool
-  run_once: true
-
-- name: "Post-upgrade | Pause for kubelet stop"
-  pause:
-    seconds: 10
-  when: needs_etcd_migration|bool
-
-- name: "Post-upgrade | start kubelet on all masters"
-  service:
-    name: kubelet
-    state: started
-  delegate_to: "{{item}}"
-  with_items: "{{groups['kube-master']}}"
-  when: needs_etcd_migration|bool
-  run_once: true
-
-- name: "Post-upgrade | etcd3 upgrade | purge etcd2 k8s data"
-  command: "{{ bin_dir }}/etcdctl --endpoints={{ etcd_access_addresses }} rm -r /registry"
-  environment:
-    ETCDCTL_API: 2
-  delegate_to: "{{groups['etcd'][0]}}"
-  run_once: true
-  when: kube_apiserver_storage_backend == "etcd3" and  needs_etcd_migration|bool|default(false)

roles/kubernetes/master/tasks/pre-upgrade.yml

@@ -1,38 +1,4 @@
 ---
-- name: "Pre-upgrade | check for kube-apiserver unit file"
-  stat:
-    path: /etc/systemd/system/kube-apiserver.service
-  register: kube_apiserver_service_file
-  tags: [facts, kube-apiserver]
-
-- name: "Pre-upgrade | check for kube-apiserver init script"
-  stat:
-    path: /etc/init.d/kube-apiserver
-  register: kube_apiserver_init_script
-  tags: [facts, kube-apiserver]
-
-- name: "Pre-upgrade | stop kube-apiserver if service defined"
-  service:
-    name: kube-apiserver
-    state: stopped
-  when: (kube_apiserver_service_file.stat.exists|default(False) or kube_apiserver_init_script.stat.exists|default(False))
-  tags: kube-apiserver
-
-- name: "Pre-upgrade | remove kube-apiserver service definition"
-  file:
-    path: "{{ item }}"
-    state: absent
-  when: (kube_apiserver_service_file.stat.exists|default(False) or kube_apiserver_init_script.stat.exists|default(False))
-  with_items:
-    - /etc/systemd/system/kube-apiserver.service
-    - /etc/init.d/kube-apiserver
-  tags: kube-apiserver
-
-- name: "Pre-upgrade | See if kube-apiserver manifest exists"
-  stat:
-    path: /etc/kubernetes/manifests/kube-apiserver.manifest
-  register: kube_apiserver_manifest
-
 - name: "Pre-upgrade | etcd3 upgrade | see if old config exists"
   command: "{{ bin_dir }}/etcdctl --peers={{ etcd_access_addresses }} ls /registry/minions"
   environment:
@@ -47,19 +13,6 @@
     kube_apiserver_storage_backend: "etcd2"
   when: old_data_exists.rc == 0 and not force_etcd3|bool
 
-- name: "Pre-upgrade | etcd3 upgrade | see if data was already migrated"
-  command: "{{ bin_dir }}/etcdctl --endpoints={{ etcd_access_addresses }} get --limit=1 --prefix=true /registry/minions"
-  environment:
-    ETCDCTL_API: 3
-  register: data_migrated
-  delegate_to: "{{groups['etcd'][0]}}"
-  when: kube_apiserver_storage_backend == "etcd3"
-  failed_when: false
-
-- name: "Pre-upgrade | etcd3 upgrade | set needs_etcd_migration"
-  set_fact:
-    needs_etcd_migration: "{{ force_etcd3|default(false) and kube_apiserver_storage_backend == 'etcd3' and data_migrated.stdout_lines|length == 0 and old_data_exists.rc == 0 }}"
-
 - name: "Pre-upgrade | Delete master manifests on all kube-masters"
   file:
     path: "/etc/kubernetes/manifests/{{item[1]}}.manifest"
@@ -69,7 +22,7 @@
     - "{{groups['kube-master']}}"
     - ["kube-apiserver", "kube-controller-manager", "kube-scheduler"]
   register: kube_apiserver_manifest_replaced
-  when: (secret_changed|default(false) or etcd_secret_changed|default(false) or needs_etcd_migration|bool) and kube_apiserver_manifest.stat.exists
+  when: (secret_changed|default(false) or etcd_secret_changed|default(false))
 
 - name: "Pre-upgrade | Delete master containers forcefully on all kube-masters"
   shell: "docker ps -f name=k8s-{{item}}* -q | xargs --no-run-if-empty docker rm -f"
@@ -77,34 +30,5 @@
   with_nested:
     - "{{groups['kube-master']}}"
     - ["kube-apiserver", "kube-controller-manager", "kube-scheduler"]
-  register: kube_apiserver_manifest_replaced
-  when: (secret_changed|default(false) or etcd_secret_changed|default(false) or needs_etcd_migration|bool) and kube_apiserver_manifest.stat.exists
-  run_once: true
-
-- name: "Pre-upgrade | etcd3 upgrade | stop etcd"
-  service:
-    name: etcd
-    state: stopped
-  delegate_to: "{{item}}"
-  with_items: "{{groups['etcd']}}"
-  when: needs_etcd_migration|bool
-  run_once: true
-
-- name: "Pre-upgrade | etcd3 upgrade | migrate data"
-  command: "{{ bin_dir }}/etcdctl migrate --data-dir=\"{{ etcd_data_dir }}\" --wal-dir=\"{{ etcd_data_dir }}/member/wal\""
-  environment:
-    ETCDCTL_API: 3
-  delegate_to: "{{item}}"
-  with_items: "{{groups['etcd']}}"
-  register: etcd_migrated
-  when: needs_etcd_migration|bool
-  run_once: true
-
-- name: "Pre-upgrade | etcd3 upgrade | start etcd"
-  service:
-    name: etcd
-    state: started
-  delegate_to: "{{item}}"
-  with_items: "{{groups['etcd']}}"
-  when: needs_etcd_migration|bool
+  when: kube_apiserver_manifest_replaced.changed
   run_once: true

roles/kubernetes/preinstall/tasks/gitinfos.yml

@@ -1,30 +0,0 @@
----
-# Deploy git infos
-# ----------------
-- name: 'GIT | Install script for collecting git info'
-  template:
-    src: "{{ role_path }}/gen-gitinfos.sh"
-    dest: "{{ bin_dir }}/gen-gitinfos.sh"
-    mode: a+rwx
-
-- name: 'GIT | generate git informations'
-  local_action: command {{ role_path }}/gen-gitinfos.sh global
-  register: gitinfo
-  check_mode: no
-
-- name: 'GIT | copy ansible information'
-  template:
-    src: ansible_git.j2
-    dest: /etc/.ansible.ini
-    backup: yes
-
-- name: 'GIT | generate diff file'
-  local_action: command {{ role_path }}/gen-gitinfos.sh diff
-  register: gitdiff
-  check_mode: no
-
-- name: 'GIT | copy git diff file'
-  copy:
-    content: "{{ gitdiff.stdout }}"
-    dest: /etc/.git-ansible.diff
-    backup: yes

roles/kubernetes/preinstall/tasks/main.yml

@@ -16,10 +16,6 @@
   become: true
   tags: bootstrap-os
 
-- include: gitinfos.yml
-  when: run_gitinfos
-  tags: facts
-
 - include: set_facts.yml
   tags: facts