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

Merge pull request #47674 from Cynerva/gkk/missing-idle-status

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 47626, 47674, 47683, 47290, 47688)

Fix Juju kubernetes-master idle status never being set

**What this PR does / why we need it**:

This fixes a problem with the kubernetes-master charm where the "Kubernetes master running." status message never gets set.

This happens because the `kube-api-endpoint.connected` state that it's waiting for doesn't exist. The state we need is `kube-api-endpoint.available` as seen [here](https://github.com/juju-solutions/interface-http/blob/master/provides.py#L12).

Additionally, we need to add the relation arguments to idle_status so it doesn't break when called.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #47676

**Special notes for your reviewer**:

**Release note**:

```release-note
Fix Juju kubernetes-master idle status never being set
```
This commit is contained in:
Kubernetes Submit Queue
2017-06-16 19:56:57 -07:00
committed by GitHub
parent d7e5a8b67e 02d0830594
commit 260fcafe95
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,9 +284,9 @@ def set_app_version():
hookenv.application_version_set(version.split(b' v')[-1].rstrip())
@when('cdk-addons.configured', 'kube-api-endpoint.connected',
@when('cdk-addons.configured', 'kube-api-endpoint.available',
'kube-control.connected')
def idle_status():
def idle_status(kube_api, kube_control):
''' Signal at the end of the run that we are running. '''
if not all_kube_system_pods_running():
hookenv.status_set('waiting', 'Waiting for kube-system pods to start')