From 72a42238849d00f1e40aee50ea11c4d628ddb272 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@virtustream.com>
Date: Wed, 28 Mar 2018 16:26:36 +0300
Subject: [PATCH] Write cloud-config during kubelet configuration
This file should only be updated during kubelet upgrade so that
master components are not accidentally restarted first during
preinstall stage.
---
roles/kubernetes/node/tasks/main.yml | 13 +++++++++++++
roles/kubernetes/preinstall/tasks/main.yml | 13 -------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/roles/kubernetes/node/tasks/main.yml b/roles/kubernetes/node/tasks/main.yml
index 4d5fa5df5..78e6d92d6 100644
--- a/roles/kubernetes/node/tasks/main.yml
+++ b/roles/kubernetes/node/tasks/main.yml
@@ -134,6 +134,19 @@
tags:
- kube-proxy
+- name: Write cloud-config
+ template:
+ src: "{{ cloud_provider }}-cloud-config.j2"
+ dest: "{{ kube_config_dir }}/cloud_config"
+ group: "{{ kube_cert_group }}"
+ mode: 0640
+ when:
+ - cloud_provider is defined
+ - cloud_provider in [ 'openstack', 'azure', 'vsphere' ]
+ notify: restart kubelet
+ tags:
+ - cloud-provider
+
# reload-systemd
- meta: flush_handlers
diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index f23040751..aca0c9606 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -256,19 +256,6 @@
tags:
- bootstrap-os
-- name: Write cloud-config
- template:
- src: "{{ cloud_provider }}-cloud-config.j2"
- dest: "{{ kube_config_dir }}/cloud_config"
- group: "{{ kube_cert_group }}"
- mode: 0640
- when:
- - inventory_hostname in groups['k8s-cluster']
- - cloud_provider is defined
- - cloud_provider in [ 'openstack', 'azure', 'vsphere' ]
- tags:
- - cloud-provider
-
- import_tasks: etchosts.yml
tags:
- bootstrap-os
--
GitLab