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
bba555bb
Commit
bba555bb
authored
7 years ago
by
Spencer Smith
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1346 from Starefossen/patch-1
Set kubedns minimum replicas to 2
parents
4b0af73d
6bd27038
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
+67
-63
67 additions, 63 deletions
.gitlab-ci.yml
roles/kubernetes-apps/ansible/defaults/main.yml
+1
-1
1 addition, 1 deletion
roles/kubernetes-apps/ansible/defaults/main.yml
with
68 additions
and
64 deletions
.gitlab-ci.yml
+
67
−
63
View file @
bba555bb
...
@@ -92,7 +92,7 @@ before_script:
...
@@ -92,7 +92,7 @@ before_script:
-
echo ${PWD}
-
echo ${PWD}
-
echo "${STARTUP_SCRIPT}"
-
echo "${STARTUP_SCRIPT}"
-
>
-
>
ansible-playbook tests/cloud_playbooks/create-gce.yml -i tests/local_inventory/hosts.cfg -c local
ansible-playbook tests/cloud_playbooks/create-gce.yml -i tests/local_inventory/hosts.cfg -c local
${LOG_LEVEL}
${LOG_LEVEL}
-e cloud_image=${CLOUD_IMAGE}
-e cloud_image=${CLOUD_IMAGE}
-e cloud_region=${CLOUD_REGION}
-e cloud_region=${CLOUD_REGION}
...
@@ -118,7 +118,7 @@ before_script:
...
@@ -118,7 +118,7 @@ before_script:
${SSH_ARGS}
${SSH_ARGS}
${LOG_LEVEL}
${LOG_LEVEL}
-e ansible_python_interpreter=${PYPATH}
-e ansible_python_interpreter=${PYPATH}
-e ansible_ssh_user=${SSH_USER}
-e ansible_ssh_user=${SSH_USER}
-e bootstrap_os=${BOOTSTRAP_OS}
-e bootstrap_os=${BOOTSTRAP_OS}
-e cert_management=${CERT_MGMT:-script}
-e cert_management=${CERT_MGMT:-script}
-e cloud_provider=gce
-e cloud_provider=gce
...
@@ -127,6 +127,7 @@ before_script:
...
@@ -127,6 +127,7 @@ before_script:
-e download_run_once=${DOWNLOAD_RUN_ONCE}
-e download_run_once=${DOWNLOAD_RUN_ONCE}
-e etcd_deployment_type=${ETCD_DEPLOYMENT}
-e etcd_deployment_type=${ETCD_DEPLOYMENT}
-e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
-e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
-e kubedns_min_replicas=1
-e kubelet_deployment_type=${KUBELET_DEPLOYMENT}
-e kubelet_deployment_type=${KUBELET_DEPLOYMENT}
-e local_release_dir=${PWD}/downloads
-e local_release_dir=${PWD}/downloads
-e resolvconf_mode=${RESOLVCONF_MODE}
-e resolvconf_mode=${RESOLVCONF_MODE}
...
@@ -136,30 +137,31 @@ before_script:
...
@@ -136,30 +137,31 @@ before_script:
# Repeat deployment if testing upgrade
# Repeat deployment if testing upgrade
-
>
-
>
if [ "${UPGRADE_TEST}" != "false" ]; then
if [ "${UPGRADE_TEST}" != "false" ]; then
test "${UPGRADE_TEST}" == "basic" && PLAYBOOK="cluster.yml";
test "${UPGRADE_TEST}" == "basic" && PLAYBOOK="cluster.yml";
test "${UPGRADE_TEST}" == "graceful" && PLAYBOOK="upgrade-cluster.yml";
test "${UPGRADE_TEST}" == "graceful" && PLAYBOOK="upgrade-cluster.yml";
pip install ansible==2.3.0;
pip install ansible==2.3.0;
git checkout "${CI_BUILD_REF}";
git checkout "${CI_BUILD_REF}";
ansible-playbook -i inventory/inventory.ini -b --become-user=root --private-key=${HOME}/.ssh/id_rsa -u $SSH_USER
ansible-playbook -i inventory/inventory.ini -b --become-user=root --private-key=${HOME}/.ssh/id_rsa -u $SSH_USER
${SSH_ARGS}
${SSH_ARGS}
${LOG_LEVEL}
${LOG_LEVEL}
-e ansible_python_interpreter=${PYPATH}
-e ansible_python_interpreter=${PYPATH}
-e ansible_ssh_user=${SSH_USER}
-e ansible_ssh_user=${SSH_USER}
-e bootstrap_os=${BOOTSTRAP_OS}
-e bootstrap_os=${BOOTSTRAP_OS}
-e cloud_provider=gce
-e cloud_provider=gce
-e deploy_netchecker=true
-e deploy_netchecker=true
-e download_localhost=${DOWNLOAD_LOCALHOST}
-e download_localhost=${DOWNLOAD_LOCALHOST}
-e download_run_once=${DOWNLOAD_RUN_ONCE}
-e download_run_once=${DOWNLOAD_RUN_ONCE}
-e etcd_deployment_type=${ETCD_DEPLOYMENT}
-e etcd_deployment_type=${ETCD_DEPLOYMENT}
-e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
-e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
-e kubelet_deployment_type=${KUBELET_DEPLOYMENT}
-e kubedns_min_replicas=1
-e local_release_dir=${PWD}/downloads
-e kubelet_deployment_type=${KUBELET_DEPLOYMENT}
-e resolvconf_mode=${RESOLVCONF_MODE}
-e local_release_dir=${PWD}/downloads
-e weave_cpu_requests=${WEAVE_CPU_LIMIT}
-e resolvconf_mode=${RESOLVCONF_MODE}
-e weave_cpu_limit=${WEAVE_CPU_LIMIT}
-e weave_cpu_requests=${WEAVE_CPU_LIMIT}
--limit "all:!fake_hosts"
-e weave_cpu_limit=${WEAVE_CPU_LIMIT}
$PLAYBOOK;
--limit "all:!fake_hosts"
$PLAYBOOK;
fi
fi
# Tests Cases
# Tests Cases
...
@@ -175,40 +177,41 @@ before_script:
...
@@ -175,40 +177,41 @@ before_script:
## Idempotency checks 1/5 (repeat deployment)
## Idempotency checks 1/5 (repeat deployment)
-
>
-
>
if [ "${IDEMPOT_CHECK}" = "true" ]; then
if [ "${IDEMPOT_CHECK}" = "true" ]; then
ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS
ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS
-b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
-b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
--private-key=${HOME}/.ssh/id_rsa
--private-key=${HOME}/.ssh/id_rsa
-e bootstrap_os=${BOOTSTRAP_OS}
-e bootstrap_os=${BOOTSTRAP_OS}
-e ansible_python_interpreter=${PYPATH}
-e ansible_python_interpreter=${PYPATH}
-e download_localhost=${DOWNLOAD_LOCALHOST}
-e download_localhost=${DOWNLOAD_LOCALHOST}
-e download_run_once=${DOWNLOAD_RUN_ONCE}
-e download_run_once=${DOWNLOAD_RUN_ONCE}
-e deploy_netchecker=true
-e deploy_netchecker=true
-e resolvconf_mode=${RESOLVCONF_MODE}
-e resolvconf_mode=${RESOLVCONF_MODE}
-e local_release_dir=${PWD}/downloads
-e local_release_dir=${PWD}/downloads
-e etcd_deployment_type=${ETCD_DEPLOYMENT}
-e etcd_deployment_type=${ETCD_DEPLOYMENT}
-e kubelet_deployment_type=${KUBELET_DEPLOYMENT}
-e kubedns_min_replicas=1
--limit "all:!fake_hosts"
-e kubelet_deployment_type=${KUBELET_DEPLOYMENT}
--limit "all:!fake_hosts"
cluster.yml;
cluster.yml;
fi
fi
## Idempotency checks 2/5 (Advanced DNS checks)
## Idempotency checks 2/5 (Advanced DNS checks)
-
>
-
>
if [ "${IDEMPOT_CHECK}" = "true" ]; then
if [ "${IDEMPOT_CHECK}" = "true" ]; then
ansible-playbook -i inventory/inventory.ini -e ansible_python_interpreter=${PYPATH}
ansible-playbook -i inventory/inventory.ini -e ansible_python_interpreter=${PYPATH}
-u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root
-u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root
--limit "all:!fake_hosts"
--limit "all:!fake_hosts"
tests/testcases/040_check-network-adv.yml $LOG_LEVEL;
tests/testcases/040_check-network-adv.yml $LOG_LEVEL;
fi
fi
## Idempotency checks 3/5 (reset deployment)
## Idempotency checks 3/5 (reset deployment)
-
>
-
>
if [ "${IDEMPOT_CHECK}" = "true" AND "${RESET_CHECK}" = "true" ]; then
if [ "${IDEMPOT_CHECK}" = "true" AND "${RESET_CHECK}" = "true" ]; then
ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS
ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS
-b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
-b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
--private-key=${HOME}/.ssh/id_rsa
--private-key=${HOME}/.ssh/id_rsa
-e bootstrap_os=${BOOTSTRAP_OS}
-e bootstrap_os=${BOOTSTRAP_OS}
-e ansible_python_interpreter=${PYPATH}
-e ansible_python_interpreter=${PYPATH}
-e reset_confirmation=yes
-e reset_confirmation=yes
--limit "all:!fake_hosts"
--limit "all:!fake_hosts"
reset.yml;
reset.yml;
fi
fi
...
@@ -216,28 +219,29 @@ before_script:
...
@@ -216,28 +219,29 @@ before_script:
## Idempotency checks 4/5 (redeploy after reset)
## Idempotency checks 4/5 (redeploy after reset)
-
>
-
>
if [ "${IDEMPOT_CHECK}" = "true" AND "${RESET_CHECK}" = "true" ]; then
if [ "${IDEMPOT_CHECK}" = "true" AND "${RESET_CHECK}" = "true" ]; then
ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS
ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS
-b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
-b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
--private-key=${HOME}/.ssh/id_rsa
--private-key=${HOME}/.ssh/id_rsa
-e bootstrap_os=${BOOTSTRAP_OS}
-e bootstrap_os=${BOOTSTRAP_OS}
-e ansible_python_interpreter=${PYPATH}
-e ansible_python_interpreter=${PYPATH}
-e download_localhost=${DOWNLOAD_LOCALHOST}
-e download_localhost=${DOWNLOAD_LOCALHOST}
-e download_run_once=${DOWNLOAD_RUN_ONCE}
-e download_run_once=${DOWNLOAD_RUN_ONCE}
-e deploy_netchecker=true
-e deploy_netchecker=true
-e resolvconf_mode=${RESOLVCONF_MODE}
-e resolvconf_mode=${RESOLVCONF_MODE}
-e local_release_dir=${PWD}/downloads
-e local_release_dir=${PWD}/downloads
-e etcd_deployment_type=${ETCD_DEPLOYMENT}
-e etcd_deployment_type=${ETCD_DEPLOYMENT}
-e kubelet_deployment_type=${KUBELET_DEPLOYMENT}
-e kubedns_min_replicas=1
--limit "all:!fake_hosts"
-e kubelet_deployment_type=${KUBELET_DEPLOYMENT}
--limit "all:!fake_hosts"
cluster.yml;
cluster.yml;
fi
fi
## Idempotency checks 5/5 (Advanced DNS checks)
## Idempotency checks 5/5 (Advanced DNS checks)
-
>
-
>
if [ "${IDEMPOT_CHECK}" = "true" AND "${RESET_CHECK}" = "true" ]; then
if [ "${IDEMPOT_CHECK}" = "true" AND "${RESET_CHECK}" = "true" ]; then
ansible-playbook -i inventory/inventory.ini -e ansible_python_interpreter=${PYPATH}
ansible-playbook -i inventory/inventory.ini -e ansible_python_interpreter=${PYPATH}
-u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root
-u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root
--limit "all:!fake_hosts"
--limit "all:!fake_hosts"
tests/testcases/040_check-network-adv.yml $LOG_LEVEL;
tests/testcases/040_check-network-adv.yml $LOG_LEVEL;
fi
fi
...
@@ -603,7 +607,7 @@ ci-authorized:
...
@@ -603,7 +607,7 @@ ci-authorized:
script
:
script
:
-
/bin/sh scripts/premoderator.sh
-
/bin/sh scripts/premoderator.sh
except
:
[
'
triggers'
,
'
master'
]
except
:
[
'
triggers'
,
'
master'
]
syntax-check
:
syntax-check
:
<<
:
*job
<<
:
*job
stage
:
unit-tests
stage
:
unit-tests
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes-apps/ansible/defaults/main.yml
+
1
−
1
View file @
bba555bb
...
@@ -6,7 +6,7 @@ kubednsautoscaler_version: 1.1.1
...
@@ -6,7 +6,7 @@ kubednsautoscaler_version: 1.1.1
dns_memory_limit
:
170Mi
dns_memory_limit
:
170Mi
dns_cpu_requests
:
100m
dns_cpu_requests
:
100m
dns_memory_requests
:
70Mi
dns_memory_requests
:
70Mi
kubedns_min_replicas
:
1
kubedns_min_replicas
:
2
kubedns_nodes_per_replica
:
10
kubedns_nodes_per_replica
:
10
# Images
# Images
...
...
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