github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #60873 from wwwtyro/rye/upgrade-needed-bugfix

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 60710, 60855, 60873, 60895, 60862). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Bugfix for erroneous upgrade needed messaging in kubernetes worker charm.

**What this PR does / why we need it**: Bugfix for erroneous upgrade needed messaging in kubernetes worker charm.

**Release note**:
```release-note
Bugfix for erroneous upgrade needed messaging in kubernetes worker charm.
```
This commit is contained in:
Kubernetes Submit Queue 2018-03-20 10:34:41 -07:00 committed by GitHub
commit 95d1fb7ca3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@ -78,20 +78,22 @@ def upgrade_charm():
set_state('kubernetes-worker.restart-needed') set_state('kubernetes-worker.restart-needed')
def get_snap_resource_paths():
resources = ['kubectl', 'kubelet', 'kube-proxy']
return [hookenv.resource_get(resource) for resource in resources]
def check_resources_for_upgrade_needed(): def check_resources_for_upgrade_needed():
hookenv.status_set('maintenance', 'Checking resources') hookenv.status_set('maintenance', 'Checking resources')
resources = ['kubectl', 'kubelet', 'kube-proxy'] if any_file_changed(get_snap_resource_paths()):
paths = [hookenv.resource_get(resource) for resource in resources]
if any_file_changed(paths):
set_upgrade_needed() set_upgrade_needed()
def set_upgrade_needed(): def set_upgrade_needed():
set_state('kubernetes-worker.snaps.upgrade-needed') set_state('kubernetes-worker.snaps.upgrade-needed')
config = hookenv.config() config = hookenv.config()
previous_channel = config.previous('channel')
require_manual = config.get('require-manual-upgrade') require_manual = config.get('require-manual-upgrade')
if previous_channel is None or not require_manual: if not require_manual:
set_state('kubernetes-worker.snaps.upgrade-specified') set_state('kubernetes-worker.snaps.upgrade-specified')
@ -127,21 +129,34 @@ def cleanup_pre_snap_services():
os.remove(file) os.remove(file)
@when_not('kubernetes-worker.snap.resources-available')
def check_snap_resources():
for path in get_snap_resource_paths():
if not path or not os.path.exists(path):
msg = 'Missing snap resources.'
hookenv.status_set('blocked', msg)
return
set_state('kubernetes-worker.snap.resources-available')
set_state('kubernetes-worker.snaps.upgrade-specified')
@when('config.changed.channel') @when('config.changed.channel')
def channel_changed(): def channel_changed():
set_upgrade_needed() set_upgrade_needed()
@when('kubernetes-worker.snaps.upgrade-needed') @when('kubernetes-worker.snaps.upgrade-needed',
'kubernetes-worker.snap.resources-available')
@when_not('kubernetes-worker.snaps.upgrade-specified') @when_not('kubernetes-worker.snaps.upgrade-specified')
def upgrade_needed_status(): def upgrade_needed_status():
msg = 'Needs manual upgrade, run the upgrade action' msg = 'Needs manual upgrade, run the upgrade action'
hookenv.status_set('blocked', msg) hookenv.status_set('blocked', msg)
@when('kubernetes-worker.snaps.upgrade-specified') @when('kubernetes-worker.snap.resources-available',
'kubernetes-worker.snaps.upgrade-specified')
def install_snaps(): def install_snaps():
check_resources_for_upgrade_needed() any_file_changed(get_snap_resource_paths())
channel = hookenv.config('channel') channel = hookenv.config('channel')
hookenv.status_set('maintenance', 'Installing kubectl snap') hookenv.status_set('maintenance', 'Installing kubectl snap')
snap.install('kubectl', channel=channel, classic=True) snap.install('kubectl', channel=channel, classic=True)