github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Handling the case of an upgrade from a non-rolling master with resource change

Browse Source
This commit is contained in:
Konstantinos Tsakalozos 2017-11-29 09:56:42 +02:00
parent 61d9848438
commit f0ace95218
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View File

@ -62,13 +62,14 @@ nrpe.Check.shortname_re = '[\.A-Za-z0-9-_]+$'
os.environ['PATH'] += os.pathsep + os.path.join(os.sep, 'snap', 'bin') os.environ['PATH'] += os.pathsep + os.path.join(os.sep, 'snap', 'bin')
def set_upgrade_needed():
def set_upgrade_needed(forced=False):
set_state('kubernetes-master.upgrade-needed') set_state('kubernetes-master.upgrade-needed')
config = hookenv.config() config = hookenv.config()
previous_channel = config.previous('channel') previous_channel = config.previous('channel')
require_manual = config.get('require-manual-upgrade') require_manual = config.get('require-manual-upgrade')
hookenv.log('set upgrade needed') hookenv.log('set upgrade needed')
if previous_channel is None or not require_manual: if previous_channel is None or not require_manual or forced:
hookenv.log('forcing upgrade') hookenv.log('forcing upgrade')
set_state('kubernetes-master.upgrade-specified') set_state('kubernetes-master.upgrade-specified')
@ -101,16 +102,27 @@ def check_for_upgrade_needed():
add_rbac_roles() add_rbac_roles()
set_state('reconfigure.authentication.setup') set_state('reconfigure.authentication.setup')
remove_state('authentication.setup') remove_state('authentication.setup')
if snap_resources_changed(): changed = snap_resources_changed()
if changed == 'yes':
set_upgrade_needed() set_upgrade_needed()
elif changed == 'unknown':
# We are here on an upgrade from non-rolling master
# Since this upgrade might also include resource updates eg
# juju upgrade-charm kubernetes-master --resource kube-any=my.snap
# we take no risk and forcibly upgrade the snaps.
# Forcibly means we do not prompt the user to call the upgrade action.
set_upgrade_needed(forced=True)
def snap_resources_changed(): def snap_resources_changed():
''' '''
Check if the snapped resources have changed. The first time this method is Check if the snapped resources have changed. The first time this method is
called will report no change. called will report "unknown".
Returns: True in case a snap resource file has changed Returns: "yes" in case a snap resource file has changed,
"no" in case a snap resources are the same as last call,
"unknown" if it is the first time this method is called
''' '''
db = unitdata.kv() db = unitdata.kv()
@ -118,11 +130,12 @@ def snap_resources_changed():
'kube-scheduler', 'cdk-addons'] 'kube-scheduler', 'cdk-addons']
paths = [hookenv.resource_get(resource) for resource in resources] paths = [hookenv.resource_get(resource) for resource in resources]
if db.get('snap.resources.fingerprint.initialised'): if db.get('snap.resources.fingerprint.initialised'):
return any_file_changed(paths) result = 'yes' if any_file_changed(paths) else 'no'
return result
else: else:
db.set('snap.resources.fingerprint.initialised', True) db.set('snap.resources.fingerprint.initialised', True)
any_file_changed(paths) any_file_changed(paths)
return False return 'unknown'
def add_rbac_roles(): def add_rbac_roles():