From b0eaf0b0759e7416c8650d6321ffd9d7c54a7688 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Wed, 4 Apr 2018 15:31:32 +0300 Subject: [PATCH] Remove GPU label during upgrade if needed --- .../kubernetes-worker/reactive/kubernetes_worker.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index 750aabb15d7..91b3d56e330 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -69,8 +69,14 @@ def upgrade_charm(): # Remove gpu.enabled state so we can reconfigure gpu-related kubelet flags, # since they can differ between k8s versions - remove_state('kubernetes-worker.gpu.enabled') - disable_gpu() + if is_state('kubernetes-worker.gpu.enabled'): + remove_state('kubernetes-worker.gpu.enabled') + try: + disable_gpu() + except ApplyNodeLabelFailed: + # Removing node label failed. Probably the master is unavailable. + # Proceed with the upgrade in hope GPUs will still be there. + hookenv.log('Failed to remove GPU labels. Proceed with upgrade.') remove_state('kubernetes-worker.cni-plugins.installed') remove_state('kubernetes-worker.config.created')