openstack/openstack-helm
Code Issues Proposed changes

KubeADM-AIO: allow cluster domain to be customised

Browse Source 
This PS allows the cluster domain to be customised if desired.

Change-Id: I86b9271b6248a36ce39a367b814cffa2bea6d4b3
This commit is contained in:
portdirect 2018-01-05 00:48:28 -05:00 committed by Pete Birley
parent 3e68d02fc2
commit 3dfcde8849
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/gate/devel/local-vars.yaml
View File

@ -18,3 +18,4 @@ kubernetes:
cluster: cluster:
cni: calico cni: calico
pod_subnet: 192.168.0.0/16 pod_subnet: 192.168.0.0/16
domain: cluster.local

2
tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/clean-node.yaml
View File

@ -45,7 +45,7 @@
PVC_SUPPORT_NFS=true PVC_SUPPORT_NFS=true
NET_SUPPORT_LINUXBRIDGE=true NET_SUPPORT_LINUXBRIDGE=true
KUBE_NET_POD_SUBNET="{{ kubernetes.cluster.pod_subnet }}" KUBE_NET_POD_SUBNET="{{ kubernetes.cluster.pod_subnet }}"
KUBE_NET_DNS_DOMAIN=cluster.local KUBE_NET_DNS_DOMAIN="{{ kubernetes.cluster.domain }}"
CONTAINER_RUNTIME=docker CONTAINER_RUNTIME=docker
register: kubeadm_master_deploy register: kubeadm_master_deploy
ignore_errors: True ignore_errors: True

2
tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/util-kubeadm-aio-run.yaml
View File

@ -47,7 +47,7 @@
PVC_SUPPORT_NFS=true PVC_SUPPORT_NFS=true
NET_SUPPORT_LINUXBRIDGE=true NET_SUPPORT_LINUXBRIDGE=true
KUBE_NET_POD_SUBNET="{{ kubernetes.cluster.pod_subnet }}" KUBE_NET_POD_SUBNET="{{ kubernetes.cluster.pod_subnet }}"
KUBE_NET_DNS_DOMAIN=cluster.local KUBE_NET_DNS_DOMAIN="{{ kubernetes.cluster.domain }}"
CONTAINER_RUNTIME=docker CONTAINER_RUNTIME=docker
KUBELET_NODE_LABELS="{{ kubeadm_kubelet_labels }}" KUBELET_NODE_LABELS="{{ kubeadm_kubelet_labels }}"
register: kubeadm_master_deploy register: kubeadm_master_deploy

1
tools/gate/playbooks/vars.yaml
View File

@ -28,6 +28,7 @@ kubernetes:
cluster: cluster:
cni: calico cni: calico
pod_subnet: 192.168.0.0/16 pod_subnet: 192.168.0.0/16
domain: cluster.local
nodes: nodes:
labels: labels:

2
tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubeadm-master/tasks/helm-dns.yaml
View File

@ -50,7 +50,7 @@
delegate_to: 127.0.0.1 delegate_to: 127.0.0.1
block: block:
- name: kubeadm | dns - 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: environment:
HELM_HOST: 'localhost:44134' HELM_HOST: 'localhost:44134'
- name: kubeadm | dns - name: kubeadm | dns