Attempt to force restart on hyperkube version change
- Store version inside default kubernetes files
will force to change it on hyperkube image. Since
we have salt watch on file manage contsruction
this will make core services do restart on change of
the version.
PROD-Related: PROD-20441
Change-Id: Ib43fc48a1d73c4fb54f384ca11d5c35c3bf2ab89
diff --git a/kubernetes/map.jinja b/kubernetes/map.jinja
index 74f204e..b89cdad 100644
--- a/kubernetes/map.jinja
+++ b/kubernetes/map.jinja
@@ -1,4 +1,5 @@
{% set version = salt['cmd.shell']("(hyperkube --version kubelet 2> /dev/null || echo '0.0') | sed -e 's/-.*//g' -e 's/v//g' -e 's/Kubernetes //g' | awk -F'.' '{print $1 \".\" $2}'") %}
+{% set full_version = salt['cmd.shell']("(hyperkube --version kubelet 2> /dev/null || echo '0.0') | sed -e 's/-.*//g' -e 's/v//g' -e 's/Kubernetes //g'") %}
{% set common = salt['grains.filter_by']({
'Debian': {
diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index ef8966e..83f752d 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -1,6 +1,7 @@
{%- from "kubernetes/map.jinja" import master with context %}
{%- from "kubernetes/map.jinja" import common with context %}
{%- from "kubernetes/map.jinja" import version %}
+{%- from "kubernetes/map.jinja" import full_version %}
{%- if master.enabled %}
{%- if master.auth.get('token', {}).enabled|default(True) %}
@@ -93,6 +94,8 @@
- group: root
- mode: 644
- contents: >-
+ # Using hyperkube version v{{ full_version }}
+
DAEMON_ARGS="
--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota,DefaultStorageClass
--allow-privileged=True
@@ -179,6 +182,8 @@
- group: root
- mode: 644
- contents: >-
+ # Using hyperkube version v{{ full_version }}
+
DAEMON_ARGS="
--cluster-name=kubernetes
--kubeconfig /etc/kubernetes/controller-manager.kubeconfig
@@ -207,6 +212,8 @@
- group: root
- mode: 644
- contents: >-
+ # Using hyperkube version v{{ full_version }}
+
DAEMON_ARGS="
--kubeconfig /etc/kubernetes/scheduler.kubeconfig
--leader-elect=true