epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-15 22:34:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup defaults file from kubernetes-apps and add dashboard to download role (#3800)

Browse Source 
* Remove variables defined in download role. Fixes #3799

* Cleanup some more variables

* Fix bad templating

* Minor fix

* Add dashboard to download role. Fixes #3736
This commit is contained in:
Andreas Krüger
2018-12-03 19:29:42 +01:00
committed by Kubernetes Prow Robot
parent b109f52dab
commit 9463b70edd
6 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
roles/kubernetes-apps/ansible/defaults/main.yml
View File

@@ -1,8 +1,4 @@
---
# Versions
kubedns_version: 1.14.13
kubednsautoscaler_version: 1.2.0
# Limits for dnsmasq/kubedns apps
dns_memory_limit: 170Mi
dns_cpu_requests: 100m
@@ -10,27 +6,13 @@ dns_memory_requests: 70Mi
dns_min_replicas: 2
dns_nodes_per_replica: 10
dns_cores_per_replica: 20
dns_prevent_single_point_failure: "{{ 'true' if dns_min_replicas > 1 else 'false' }}"
# Images
image_arch: "{{host_architecture}}"
kubedns_image_repo: "gcr.io/google_containers/k8s-dns-kube-dns-{{ image_arch }}"
kubedns_image_tag: "{{ kubedns_version }}"
dnsmasq_nanny_image_repo: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-{{ image_arch }}"
dnsmasq_nanny_image_tag: "{{ kubedns_version }}"
dnsmasq_sidecar_image_repo: "gcr.io/google_containers/k8s-dns-sidecar-{{ image_arch }}"
dnsmasq_sidecar_image_tag: "{{ kubedns_version }}"
dnsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-autoscaler-{{ image_arch }}"
dnsautoscaler_image_tag: "{{ kubednsautoscaler_version }}"
dns_prevent_single_point_failure: "{{ 'true' if dns_min_replicas|int > 1 else 'false' }}"
# Netchecker
deploy_netchecker: false
netchecker_port: 31081
agent_report_interval: 15
netcheck_namespace: default
agent_img: "{{ netcheck_agent_image_repo }}:{{ netcheck_agent_image_tag }}"
server_img: "{{ netcheck_server_image_repo }}:{{ netcheck_server_image_tag }}"
# Limits for netchecker apps
netchecker_agent_cpu_limit: 30m
@@ -50,8 +32,6 @@ netchecker_server_group: 1000
# Dashboard
dashboard_enabled: true
dashboard_image_repo: gcr.io/google_containers/kubernetes-dashboard-{{ image_arch }}
dashboard_image_tag: v1.10.0
# Limits for dashboard
dashboard_cpu_limit: 100m