From 0794a866a7e9fac802be07db001d0719984d9e0a Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Thu, 23 Mar 2017 18:55:37 +0300
Subject: [PATCH] switch debian8-canal-ha to ubuntu
---
.gitlab-ci.yml | 12 ++++++------
roles/kubernetes/master/tasks/main.yml | 2 ++
roles/kubernetes/master/tasks/pre-upgrade.yml | 10 +++++++++-
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f8c08279..186251328 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -260,10 +260,10 @@ before_script:
BOOTSTRAP_OS: coreos
RESOLVCONF_MODE: host_resolvconf # This is required as long as the CoreOS stable channel uses docker < 1.12
-.debian8_canal_ha_variables: &debian8_canal_ha_variables
+.ubuntu_canal_ha_variables: &ubuntu_canal_ha_variables
# stage: deploy-gce-part1
KUBE_NETWORK_PLUGIN: canal
- CLOUD_IMAGE: debian-8-kubespray
+ CLOUD_IMAGE: ubuntu-1604-xenial
CLOUD_REGION: europe-west1-b
UPGRADE_TEST: "basic"
CLUSTER_MODE: ha
@@ -416,24 +416,24 @@ ubuntu-weave-sep-triggers:
only: ['triggers']
# More builds for PRs/merges (manual) and triggers (auto)
-debian8-canal-ha:
+ubuntu-canal-ha:
stage: deploy-gce-part1
<<: *job
<<: *gce
variables:
<<: *gce_variables
- <<: *debian8_canal_ha_variables
+ <<: *ubuntu_canal_ha_variables
when: manual
except: ['triggers']
only: ['master', /^pr-.*$/]
-debian8-canal-ha-triggers:
+ubuntu-canal-ha-triggers:
stage: deploy-gce-part1
<<: *job
<<: *gce
variables:
<<: *gce_variables
- <<: *debian8_canal_ha_variables
+ <<: *ubuntu_canal_ha_variables
when: on_success
only: ['triggers']
diff --git a/roles/kubernetes/master/tasks/main.yml b/roles/kubernetes/master/tasks/main.yml
index 2bd9758bf..f0e944bd9 100644
--- a/roles/kubernetes/master/tasks/main.yml
+++ b/roles/kubernetes/master/tasks/main.yml
@@ -52,6 +52,8 @@
- name: Create kube system namespace
command: "{{ bin_dir }}/kubectl create -f {{kube_config_dir}}/{{system_namespace}}-ns.yml"
+ retries: 4
+ delay: "{{ retry_stagger | random + 3 }}"
changed_when: False
when: kubesystem|failed and inventory_hostname == groups['kube-master'][0]
tags: apps
diff --git a/roles/kubernetes/master/tasks/pre-upgrade.yml b/roles/kubernetes/master/tasks/pre-upgrade.yml
index 10093a08f..7776b9703 100644
--- a/roles/kubernetes/master/tasks/pre-upgrade.yml
+++ b/roles/kubernetes/master/tasks/pre-upgrade.yml
@@ -95,5 +95,13 @@
delegate_to: "{{item}}"
with_items: "{{groups['etcd']}}"
when: needs_etcd_migration|bool
- notify: "Master | reload kubelet"
+
+- name: "Pre-upgrade | restart kubelet on all masters"
+ service:
+ name: kubelet
+ state: restarted
+ delegate_to: "{{item}}"
+ with_items: "{{groups['kube-master']}}"
+ register: kube_apiserver_manifest_replaced
+ when: needs_etcd_migration|bool
--
GitLab