github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

The change in channels will be caught config change after the upgrade.

Browse Source
This commit is contained in:
Konstantinos Tsakalozos 2017-11-28 12:24:40 +02:00
parent 280b833f39
commit 1550df99eb
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,25 +102,11 @@ 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 should_reinstall_snaps():
set_upgrade_needed()
def should_reinstall_snaps():
''' Return true if we should redeploy snaps. '''
# Snaps should be upgrades if:
# a) channel changed, or
# b) the Charms attached snaps (resources) changed
config = hookenv.config()
previous_channel = config.previous('channel')
new_channel = hookenv.config('channel')
if new_channel != previous_channel:
return True
resources = ['kubectl', 'kube-apiserver', 'kube-controller-manager', resources = ['kubectl', 'kube-apiserver', 'kube-controller-manager',
'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]
return any_file_changed(paths) if any_file_changed(paths):
set_upgrade_needed()
def add_rbac_roles(): def add_rbac_roles():