Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
428a63e9
Commit
428a63e9
authored
Jun 25, 2018
by
Kevin W Monroe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lint fixes for goal state checks
parent
759f3e21
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
kubernetes_master.py
...ju/layers/kubernetes-master/reactive/kubernetes_master.py
+2
-2
kubernetes_worker.py
...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+3
-3
No files found.
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View file @
428a63e9
...
@@ -402,7 +402,7 @@ def set_final_status():
...
@@ -402,7 +402,7 @@ def set_final_status():
goal_state
=
{}
goal_state
=
{}
if
not
is_state
(
'kube-api-endpoint.available'
):
if
not
is_state
(
'kube-api-endpoint.available'
):
if
'
relations'
in
goal_state
and
'kube-api-endpoint'
in
goal_state
[
'relations'
]
:
if
'
kube-api-endpoint'
in
goal_state
.
get
(
'relations'
,
{})
:
status
=
'waiting'
status
=
'waiting'
else
:
else
:
status
=
'blocked'
status
=
'blocked'
...
@@ -410,7 +410,7 @@ def set_final_status():
...
@@ -410,7 +410,7 @@ def set_final_status():
return
return
if
not
is_state
(
'kube-control.connected'
):
if
not
is_state
(
'kube-control.connected'
):
if
'
relations'
in
goal_state
and
'kube-control'
in
goal_state
[
'relations'
]
:
if
'
kube-control'
in
goal_state
.
get
(
'relations'
,
{})
:
status
=
'waiting'
status
=
'waiting'
else
:
else
:
status
=
'blocked'
status
=
'blocked'
...
...
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View file @
428a63e9
...
@@ -403,8 +403,8 @@ def sdn_changed():
...
@@ -403,8 +403,8 @@ def sdn_changed():
@when
(
'kubernetes-worker.config.created'
)
@when
(
'kubernetes-worker.config.created'
)
@when_not
(
'kubernetes-worker.ingress.available'
)
@when_not
(
'kubernetes-worker.ingress.available'
)
def
render_and_launch_ingress
():
def
render_and_launch_ingress
():
''' If configuration has ingress daemon set enabled, launch the ingress
load
''' If configuration has ingress daemon set enabled, launch the ingress
balancer and default http backend. Otherwise attempt deletion. '''
load
balancer and default http backend. Otherwise attempt deletion. '''
config
=
hookenv
.
config
()
config
=
hookenv
.
config
()
# If ingress is enabled, launch the ingress controller
# If ingress is enabled, launch the ingress controller
if
config
.
get
(
'ingress'
):
if
config
.
get
(
'ingress'
):
...
@@ -1016,7 +1016,7 @@ def missing_kube_control():
...
@@ -1016,7 +1016,7 @@ def missing_kube_control():
except
NotImplementedError
:
except
NotImplementedError
:
goal_state
=
{}
goal_state
=
{}
if
'
relations'
in
goal_state
and
'kube-control'
in
goal_state
[
'relations'
]
:
if
'
kube-control'
in
goal_state
.
get
(
'relations'
,
{})
:
hookenv
.
status_set
(
hookenv
.
status_set
(
'waiting'
,
'waiting'
,
'Waiting for kubernetes-master to become ready'
)
'Waiting for kubernetes-master to become ready'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment