Merge branch 'dev' of https://github.com/gjmzj/kubeasz into dev

morganwang010 · Jul 25, 2018 · 4318da1 · 4318da1
2 parents 9d303ec + 099cd4a
commit 4318da1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,22 @@
 down/*
 !down/download.sh
 !down/offline_images
+
+# k8s binaries directory
 bin/*
 !bin/readme.md
+
+# kube-dns controller
 manifests/kubedns/kubedns.yaml
 manifests/coredns/coredns.yaml
+
+# ansible hosts
 hosts
+
+# k8s backup directory
 roles/cluster-backup/files/*
 !roles/cluster-backup/files/readme.md
+
+# roles/xxx/vars, exclude roles/os-harden/vars/
+/roles/*/vars/*
+!/roles/os-harden/vars/
diff --git a/roles/cluster-addon/defaults/main.yml b/roles/cluster-addon/defaults/main.yml
@@ -3,6 +3,11 @@ dns_install: "yes"
 dns_backend: "coredns"
 kubedns_offline: "kubedns_1.14.10.tar"
 coredns_offline: "coredns_1.1.3.tar"
+dns_offline: "{%- if dns_backend == 'coredns' -%} \
+                {{ coredns_offline }} \
+              {%- else -%} \
+                {{ kubedns_offline }} \
+              {%- endif -%}"
 
 # metric server 自动安装
 metricsserver_install: "yes"

diff --git a/roles/cluster-addon/vars/main.yml b/roles/cluster-addon/vars/main.yml