github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix missed cloud-request-sent flags

pull/8/head
Cory Johns 2018-08-22 15:50:49 -04:00 committed by cdkbot
parent 161540eb31
commit 7c2f5e328f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1709,7 +1709,7 @@ def set_cloud_pending():
'endpoint.gcp.joined', 'endpoint.gcp.joined',
'endpoint.azure.joined') 'endpoint.azure.joined')
@when('leadership.set.cluster_tag') @when('leadership.set.cluster_tag')
@when_not('kubernetes-master.cloud-request-sent') @when_not('kubernetes-master.cloud.request-sent')
def request_integration(): def request_integration():
hookenv.status_set('maintenance', 'requesting cloud integration') hookenv.status_set('maintenance', 'requesting cloud integration')
cluster_tag = leader_get('cluster_tag') cluster_tag = leader_get('cluster_tag')
@ -1747,7 +1747,7 @@ def request_integration():
cloud.enable_network_management() cloud.enable_network_management()
cloud.enable_dns_management() cloud.enable_dns_management()
cloud.enable_block_storage_management() cloud.enable_block_storage_management()
set_state('kubernetes-master.cloud-request-sent') set_state('kubernetes-master.cloud.request-sent')
@when_none('endpoint.aws.joined', @when_none('endpoint.aws.joined',

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

@ -1296,7 +1296,7 @@ def set_cloud_pending():
'endpoint.gcp.joined', 'endpoint.gcp.joined',
'endpoint.azure.joined') 'endpoint.azure.joined')
@when('kube-control.cluster_tag.available') @when('kube-control.cluster_tag.available')
@when_not('kubernetes-worker.cloud-request-sent') @when_not('kubernetes-worker.cloud.request-sent')
def request_integration(): def request_integration():
hookenv.status_set('maintenance', 'requesting cloud integration') hookenv.status_set('maintenance', 'requesting cloud integration')
kube_control = endpoint_from_flag('kube-control.cluster_tag.available') kube_control = endpoint_from_flag('kube-control.cluster_tag.available')
@ -1327,7 +1327,7 @@ def request_integration():
cloud.enable_object_storage_management() cloud.enable_object_storage_management()
cloud.enable_instance_inspection() cloud.enable_instance_inspection()
cloud.enable_dns_management() cloud.enable_dns_management()
set_state('kubernetes-worker.cloud-request-sent') set_state('kubernetes-worker.cloud.request-sent')
hookenv.status_set('waiting', 'Waiting for cloud integration') hookenv.status_set('waiting', 'Waiting for cloud integration')