diff --git a/tools/gate/devel/local-vars.yaml b/tools/gate/devel/local-vars.yaml index 5699fb92c..540462c3b 100644 --- a/tools/gate/devel/local-vars.yaml +++ b/tools/gate/devel/local-vars.yaml @@ -18,3 +18,4 @@ kubernetes: cluster: cni: calico pod_subnet: 192.168.0.0/16 + domain: cluster.local diff --git a/tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/clean-node.yaml b/tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/clean-node.yaml index 8811e460b..75338d2ba 100644 --- a/tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/clean-node.yaml +++ b/tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/clean-node.yaml @@ -45,7 +45,7 @@ PVC_SUPPORT_NFS=true NET_SUPPORT_LINUXBRIDGE=true KUBE_NET_POD_SUBNET="{{ kubernetes.cluster.pod_subnet }}" - KUBE_NET_DNS_DOMAIN=cluster.local + KUBE_NET_DNS_DOMAIN="{{ kubernetes.cluster.domain }}" CONTAINER_RUNTIME=docker register: kubeadm_master_deploy ignore_errors: True diff --git a/tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/util-kubeadm-aio-run.yaml b/tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/util-kubeadm-aio-run.yaml index 272c80fdb..c184190ce 100644 --- a/tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/util-kubeadm-aio-run.yaml +++ b/tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/util-kubeadm-aio-run.yaml @@ -47,7 +47,7 @@ PVC_SUPPORT_NFS=true NET_SUPPORT_LINUXBRIDGE=true KUBE_NET_POD_SUBNET="{{ kubernetes.cluster.pod_subnet }}" - KUBE_NET_DNS_DOMAIN=cluster.local + KUBE_NET_DNS_DOMAIN="{{ kubernetes.cluster.domain }}" CONTAINER_RUNTIME=docker KUBELET_NODE_LABELS="{{ kubeadm_kubelet_labels }}" register: kubeadm_master_deploy diff --git a/tools/gate/playbooks/vars.yaml b/tools/gate/playbooks/vars.yaml index a434ca176..d3f47faa0 100644 --- a/tools/gate/playbooks/vars.yaml +++ b/tools/gate/playbooks/vars.yaml @@ -28,6 +28,7 @@ kubernetes: cluster: cni: calico pod_subnet: 192.168.0.0/16 + domain: cluster.local nodes: labels: diff --git a/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubeadm-master/tasks/helm-dns.yaml b/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubeadm-master/tasks/helm-dns.yaml index c719ff9a7..3ca3a0987 100644 --- a/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubeadm-master/tasks/helm-dns.yaml +++ b/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubeadm-master/tasks/helm-dns.yaml @@ -50,7 +50,7 @@ delegate_to: 127.0.0.1 block: - name: kubeadm | dns - command: helm install /opt/charts/kube-dns --name kube-dns --namespace kube-system --wait + command: "helm install /opt/charts/kube-dns --name kube-dns --namespace kube-system --set networking.dnsDomain={{ k8s.networking.dnsDomain }} --wait" environment: HELM_HOST: 'localhost:44134' - name: kubeadm | dns