Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
617edda9
Commit
617edda9
authored
8 years ago
by
Matthew Mosesohn
Browse files
Options
Downloads
Patches
Plain Diff
Adjust weave daemonset for serial deployment
parent
97ebbb96
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+3
-2
3 additions, 2 deletions
.gitlab-ci.yml
roles/kubernetes-apps/network_plugin/weave/tasks/main.yml
+3
-6
3 additions, 6 deletions
roles/kubernetes-apps/network_plugin/weave/tasks/main.yml
with
6 additions
and
8 deletions
.gitlab-ci.yml
+
3
−
2
View file @
617edda9
...
...
@@ -262,7 +262,6 @@ before_script:
KUBE_NETWORK_PLUGIN
:
weave
CLOUD_IMAGE
:
rhel-7
CLOUD_REGION
:
europe-west1-b
UPGRADE_TEST
:
"
graceful"
CLUSTER_MODE
:
default
.centos7_flannel_variables
:
¢os7_flannel_variables
...
...
@@ -278,6 +277,7 @@ before_script:
CLOUD_IMAGE
:
debian-8-kubespray
CLOUD_REGION
:
us-central1-b
CLUSTER_MODE
:
default
UPGRADE_TEST
:
"
graceful"
.coreos_canal_variables
:
&coreos_canal_variables
# stage: deploy-gce-part2
...
...
@@ -328,6 +328,7 @@ before_script:
CLUSTER_MODE
:
separate
ETCD_DEPLOYMENT
:
rkt
KUBELET_DEPLOYMENT
:
rkt
UPGRADE_TEST
:
"
graceful"
.ubuntu_vault_sep_variables
:
&ubuntu_vault_sep_variables
# stage: deploy-gce-part1
...
...
@@ -540,7 +541,7 @@ coreos-alpha-weave-ha:
except
:
[
'
triggers'
]
only
:
[
'
master'
,
/^pr-.*$/
]
ubuntu-rkt-sep
:
ubuntu-rkt-sep
-upgrade
:
stage
:
deploy-gce-part1
<<
:
*job
<<
:
*gce
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes-apps/network_plugin/weave/tasks/main.yml
+
3
−
6
View file @
617edda9
#FIXME: remove if kubernetes/features#124 is implemented
-
name
:
Weave | Purge old weave daemonset
run_once
:
true
kube
:
name
:
"
weave-net"
kubectl
:
"
{{
bin_dir
}}/kubectl"
...
...
@@ -12,7 +11,6 @@
-
name
:
Weave | Start Resources
run_once
:
true
kube
:
name
:
"
weave-net"
kubectl
:
"
{{
bin_dir
}}/kubectl"
...
...
@@ -21,17 +19,16 @@
namespace
:
"
{{system_namespace}}"
state
:
"
{{
item
|
ternary('latest','present')
}}"
with_items
:
"
{{
weave_manifest.changed
}}"
delegate_to
:
"
{{
groups['kube-master'][0]
}}"
when
:
inventory_hostname ==
groups['kube-master'][0]
-
name
:
"
Weave
|
wait
for
weave
to
become
available"
uri
:
url
:
http://127.0.0.1:6784/status
return_content
:
yes
run_once
:
true
register
:
weave_status
retries
:
1
2
retries
:
1
80
delay
:
10
until
:
"
{{
weave_status.status
==
200
and
'Status:
ready'
in
weave_status.content
}}"
delegate_to
:
"
{{
groups['kube-master'][0]
}}"
when
:
inventory_hostname ==
groups['kube-master'][0]
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment