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
a3c88a0d
Commit
a3c88a0d
authored
7 years ago
by
Spencer Smith
Browse files
Options
Downloads
Patches
Plain Diff
rename kargo mentions in top-level yml files
parent
b73786c6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
cluster.yml
+12
-12
12 additions, 12 deletions
cluster.yml
reset.yml
+1
-1
1 addition, 1 deletion
reset.yml
scale.yml
+2
-2
2 additions, 2 deletions
scale.yml
upgrade-cluster.yml
+14
-14
14 additions, 14 deletions
upgrade-cluster.yml
with
29 additions
and
29 deletions
cluster.yml
+
12
−
12
View file @
a3c88a0d
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
hosts
:
localhost
-
hosts
:
localhost
gather_facts
:
False
gather_facts
:
False
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
bastion-ssh-config
,
tags
:
[
"
localhost"
,
"
bastion"
]}
-
{
role
:
bastion-ssh-config
,
tags
:
[
"
localhost"
,
"
bastion"
]}
-
hosts
:
k8s-cluster:etcd:calico-rr
-
hosts
:
k8s-cluster:etcd:calico-rr
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
# fail. bootstrap-os fixes this on these systems, so in later plays it can be enabled.
# fail. bootstrap-os fixes this on these systems, so in later plays it can be enabled.
ansible_ssh_pipelining
:
false
ansible_ssh_pipelining
:
false
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
bootstrap-os
,
tags
:
bootstrap-os
}
-
{
role
:
bootstrap-os
,
tags
:
bootstrap-os
}
-
hosts
:
k8s-cluster:etcd:calico-rr
-
hosts
:
k8s-cluster:etcd:calico-rr
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
-
hosts
:
k8s-cluster:etcd:calico-rr
-
hosts
:
k8s-cluster:etcd:calico-rr
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
kernel-upgrade
,
tags
:
kernel-upgrade
,
when
:
kernel_upgrade is defined and kernel_upgrade
}
-
{
role
:
kernel-upgrade
,
tags
:
kernel-upgrade
,
when
:
kernel_upgrade is defined and kernel_upgrade
}
-
{
role
:
kubernetes/preinstall
,
tags
:
preinstall
}
-
{
role
:
kubernetes/preinstall
,
tags
:
preinstall
}
-
{
role
:
docker
,
tags
:
docker
}
-
{
role
:
docker
,
tags
:
docker
}
...
@@ -36,38 +36,38 @@
...
@@ -36,38 +36,38 @@
-
hosts
:
etcd:k8s-cluster:vault
-
hosts
:
etcd:k8s-cluster:vault
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
,
when
:
"
cert_management
==
'vault'"
}
-
{
role
:
k
ubespray
-defaults
,
when
:
"
cert_management
==
'vault'"
}
-
{
role
:
vault
,
tags
:
vault
,
vault_bootstrap
:
true
,
when
:
"
cert_management
==
'vault'"
}
-
{
role
:
vault
,
tags
:
vault
,
vault_bootstrap
:
true
,
when
:
"
cert_management
==
'vault'"
}
-
hosts
:
etcd
-
hosts
:
etcd
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
etcd
,
tags
:
etcd
,
etcd_cluster_setup
:
true
}
-
{
role
:
etcd
,
tags
:
etcd
,
etcd_cluster_setup
:
true
}
-
hosts
:
k8s-cluster
-
hosts
:
k8s-cluster
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
etcd
,
tags
:
etcd
,
etcd_cluster_setup
:
false
}
-
{
role
:
etcd
,
tags
:
etcd
,
etcd_cluster_setup
:
false
}
-
hosts
:
etcd:k8s-cluster:vault
-
hosts
:
etcd:k8s-cluster:vault
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
vault
,
tags
:
vault
,
when
:
"
cert_management
==
'vault'"
}
-
{
role
:
vault
,
tags
:
vault
,
when
:
"
cert_management
==
'vault'"
}
-
hosts
:
k8s-cluster
-
hosts
:
k8s-cluster
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
kubernetes/node
,
tags
:
node
}
-
{
role
:
kubernetes/node
,
tags
:
node
}
-
{
role
:
network_plugin
,
tags
:
network
}
-
{
role
:
network_plugin
,
tags
:
network
}
-
hosts
:
kube-master
-
hosts
:
kube-master
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
kubernetes/master
,
tags
:
master
}
-
{
role
:
kubernetes/master
,
tags
:
master
}
-
{
role
:
kubernetes-apps/network_plugin
,
tags
:
network
}
-
{
role
:
kubernetes-apps/network_plugin
,
tags
:
network
}
-
{
role
:
kubernetes-apps/policy_controller
,
tags
:
policy-controller
}
-
{
role
:
kubernetes-apps/policy_controller
,
tags
:
policy-controller
}
...
@@ -75,18 +75,18 @@
...
@@ -75,18 +75,18 @@
-
hosts
:
calico-rr
-
hosts
:
calico-rr
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
network_plugin/calico/rr
,
tags
:
network
}
-
{
role
:
network_plugin/calico/rr
,
tags
:
network
}
-
hosts
:
k8s-cluster
-
hosts
:
k8s-cluster
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
dnsmasq
,
when
:
"
dns_mode
==
'dnsmasq_kubedns'"
,
tags
:
dnsmasq
}
-
{
role
:
dnsmasq
,
when
:
"
dns_mode
==
'dnsmasq_kubedns'"
,
tags
:
dnsmasq
}
-
{
role
:
kubernetes/preinstall
,
when
:
"
dns_mode
!=
'none'
and
resolvconf_mode
==
'host_resolvconf'"
,
tags
:
resolvconf
}
-
{
role
:
kubernetes/preinstall
,
when
:
"
dns_mode
!=
'none'
and
resolvconf_mode
==
'host_resolvconf'"
,
tags
:
resolvconf
}
-
hosts
:
kube-master[0]
-
hosts
:
kube-master[0]
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
kubernetes-apps
,
tags
:
apps
}
-
{
role
:
kubernetes-apps
,
tags
:
apps
}
This diff is collapsed.
Click to expand it.
reset.yml
+
1
−
1
View file @
a3c88a0d
...
@@ -14,5 +14,5 @@
...
@@ -14,5 +14,5 @@
when
:
reset_confirmation != "yes"
when
:
reset_confirmation != "yes"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
reset
,
tags
:
reset
}
-
{
role
:
reset
,
tags
:
reset
}
This diff is collapsed.
Click to expand it.
scale.yml
+
2
−
2
View file @
a3c88a0d
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
vars
:
vars
:
ansible_ssh_pipelining
:
false
ansible_ssh_pipelining
:
false
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
bootstrap-os
,
tags
:
bootstrap-os
}
-
{
role
:
bootstrap-os
,
tags
:
bootstrap-os
}
##We still have to gather facts about our masters and etcd nodes
##We still have to gather facts about our masters and etcd nodes
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
-
hosts
:
kube-node
-
hosts
:
kube-node
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
kernel-upgrade
,
tags
:
kernel-upgrade
,
when
:
kernel_upgrade is defined and kernel_upgrade
}
-
{
role
:
kernel-upgrade
,
tags
:
kernel-upgrade
,
when
:
kernel_upgrade is defined and kernel_upgrade
}
-
{
role
:
kubernetes/preinstall
,
tags
:
preinstall
}
-
{
role
:
kubernetes/preinstall
,
tags
:
preinstall
}
-
{
role
:
docker
,
tags
:
docker
}
-
{
role
:
docker
,
tags
:
docker
}
...
...
This diff is collapsed.
Click to expand it.
upgrade-cluster.yml
+
14
−
14
View file @
a3c88a0d
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
hosts
:
localhost
-
hosts
:
localhost
gather_facts
:
False
gather_facts
:
False
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
bastion-ssh-config
,
tags
:
[
"
localhost"
,
"
bastion"
]}
-
{
role
:
bastion-ssh-config
,
tags
:
[
"
localhost"
,
"
bastion"
]}
-
hosts
:
k8s-cluster:etcd:calico-rr
-
hosts
:
k8s-cluster:etcd:calico-rr
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
# fail. bootstrap-os fixes this on these systems, so in later plays it can be enabled.
# fail. bootstrap-os fixes this on these systems, so in later plays it can be enabled.
ansible_ssh_pipelining
:
false
ansible_ssh_pipelining
:
false
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
bootstrap-os
,
tags
:
bootstrap-os
}
-
{
role
:
bootstrap-os
,
tags
:
bootstrap-os
}
-
hosts
:
k8s-cluster:etcd:calico-rr
-
hosts
:
k8s-cluster:etcd:calico-rr
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
-
hosts
:
k8s-cluster:etcd:calico-rr
-
hosts
:
k8s-cluster:etcd:calico-rr
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
kernel-upgrade
,
tags
:
kernel-upgrade
,
when
:
kernel_upgrade is defined and kernel_upgrade
}
-
{
role
:
kernel-upgrade
,
tags
:
kernel-upgrade
,
when
:
kernel_upgrade is defined and kernel_upgrade
}
-
{
role
:
kubernetes/preinstall
,
tags
:
preinstall
}
-
{
role
:
kubernetes/preinstall
,
tags
:
preinstall
}
-
{
role
:
docker
,
tags
:
docker
}
-
{
role
:
docker
,
tags
:
docker
}
...
@@ -36,25 +36,25 @@
...
@@ -36,25 +36,25 @@
-
hosts
:
etcd:k8s-cluster:vault
-
hosts
:
etcd:k8s-cluster:vault
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
,
when
:
"
cert_management
==
'vault'"
}
-
{
role
:
k
ubespray
-defaults
,
when
:
"
cert_management
==
'vault'"
}
-
{
role
:
vault
,
tags
:
vault
,
vault_bootstrap
:
true
,
when
:
"
cert_management
==
'vault'"
}
-
{
role
:
vault
,
tags
:
vault
,
vault_bootstrap
:
true
,
when
:
"
cert_management
==
'vault'"
}
-
hosts
:
etcd
-
hosts
:
etcd
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
etcd
,
tags
:
etcd
,
etcd_cluster_setup
:
true
}
-
{
role
:
etcd
,
tags
:
etcd
,
etcd_cluster_setup
:
true
}
-
hosts
:
k8s-cluster
-
hosts
:
k8s-cluster
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
etcd
,
tags
:
etcd
,
etcd_cluster_setup
:
false
}
-
{
role
:
etcd
,
tags
:
etcd
,
etcd_cluster_setup
:
false
}
-
hosts
:
etcd:k8s-cluster:vault
-
hosts
:
etcd:k8s-cluster:vault
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
,
when
:
"
cert_management
==
'vault'"
}
-
{
role
:
k
ubespray
-defaults
,
when
:
"
cert_management
==
'vault'"
}
-
{
role
:
vault
,
tags
:
vault
,
when
:
"
cert_management
==
'vault'"
}
-
{
role
:
vault
,
tags
:
vault
,
when
:
"
cert_management
==
'vault'"
}
#Handle upgrades to master components first to maintain backwards compat.
#Handle upgrades to master components first to maintain backwards compat.
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
serial
:
1
serial
:
1
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
upgrade/pre-upgrade
,
tags
:
pre-upgrade
}
-
{
role
:
upgrade/pre-upgrade
,
tags
:
pre-upgrade
}
-
{
role
:
kubernetes/node
,
tags
:
node
}
-
{
role
:
kubernetes/node
,
tags
:
node
}
-
{
role
:
kubernetes/master
,
tags
:
master
}
-
{
role
:
kubernetes/master
,
tags
:
master
}
...
@@ -73,35 +73,35 @@
...
@@ -73,35 +73,35 @@
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
serial
:
"
{{
serial
|
default('20%')
}}"
serial
:
"
{{
serial
|
default('20%')
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
upgrade/pre-upgrade
,
tags
:
pre-upgrade
}
-
{
role
:
upgrade/pre-upgrade
,
tags
:
pre-upgrade
}
-
{
role
:
kubernetes/node
,
tags
:
node
}
-
{
role
:
kubernetes/node
,
tags
:
node
}
-
{
role
:
network_plugin
,
tags
:
network
}
-
{
role
:
network_plugin
,
tags
:
network
}
-
{
role
:
upgrade/post-upgrade
,
tags
:
post-upgrade
}
-
{
role
:
upgrade/post-upgrade
,
tags
:
post-upgrade
}
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
hosts
:
kube-master
-
hosts
:
kube-master
any_errors_fatal
:
true
any_errors_fatal
:
true
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
kubernetes-apps/network_plugin
,
tags
:
network
}
-
{
role
:
kubernetes-apps/network_plugin
,
tags
:
network
}
-
{
role
:
kubernetes-apps/policy_controller
,
tags
:
policy-controller
}
-
{
role
:
kubernetes-apps/policy_controller
,
tags
:
policy-controller
}
-
hosts
:
calico-rr
-
hosts
:
calico-rr
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
network_plugin/calico/rr
,
tags
:
network
}
-
{
role
:
network_plugin/calico/rr
,
tags
:
network
}
-
hosts
:
k8s-cluster
-
hosts
:
k8s-cluster
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
dnsmasq
,
when
:
"
dns_mode
==
'dnsmasq_kubedns'"
,
tags
:
dnsmasq
}
-
{
role
:
dnsmasq
,
when
:
"
dns_mode
==
'dnsmasq_kubedns'"
,
tags
:
dnsmasq
}
-
{
role
:
kubernetes/preinstall
,
when
:
"
dns_mode
!=
'none'
and
resolvconf_mode
==
'host_resolvconf'"
,
tags
:
resolvconf
}
-
{
role
:
kubernetes/preinstall
,
when
:
"
dns_mode
!=
'none'
and
resolvconf_mode
==
'host_resolvconf'"
,
tags
:
resolvconf
}
-
hosts
:
kube-master[0]
-
hosts
:
kube-master[0]
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
any_errors_fatal
:
"
{{
any_errors_fatal
|
default(true)
}}"
roles
:
roles
:
-
{
role
:
k
argo
-defaults
}
-
{
role
:
k
ubespray
-defaults
}
-
{
role
:
kubernetes-apps
,
tags
:
apps
}
-
{
role
:
kubernetes-apps
,
tags
:
apps
}
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