Merge pull request kubernetes-sigs#559 from datianshi/service_domain

Add service domain to the cluster config
jayunit100 · Sep 9, 2019 · 1b8a92b · 1b8a92b
2 parents 1152b83 + 7db3354
commit 1b8a92b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/docs/getting_started.md b/docs/getting_started.md
@@ -107,6 +107,7 @@ export SSH_AUTHORIZED_KEY='ssh-rsa AAAAB3N...'      # (optional) The public ssh
 export KUBERNETES_VERSION='1.13.6'        # (optional) The Kubernetes version to use, defaults to 1.13.6
 export SERVICE_CIDR='100.64.0.0/13'       # (optional) The service CIDR of the management cluster, defaults to "100.64.0.0/13"
 export CLUSTER_CIDR='100.96.0.0/11'       # (optional) The cluster CIDR of the management cluster, defaults to "100.96.0.0/11"
+export SERVICE_DOMAIN='cluster.local'     # (optional) The k8s service domain of the management cluster, defaults to "cluster.local"
 EOF
 ```
 

diff --git a/examples/cluster/cluster.yaml b/examples/cluster/cluster.yaml
@@ -9,6 +9,7 @@ spec:
       cidrBlocks: ["${SERVICE_CIDR}"]
     pods:
       cidrBlocks: ["${CLUSTER_CIDR}"]
+    serviceDomain: ${SERVICE_DOMAIN}
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
     kind: VSphereCluster

diff --git a/examples/generate.sh b/examples/generate.sh
@@ -173,6 +173,7 @@ record_and_export() {
 record_and_export CLUSTER_NAME          ':-capv-mgmt-example'
 record_and_export SERVICE_CIDR          ':-100.64.0.0/13'
 record_and_export CLUSTER_CIDR          ':-100.96.0.0/11'
+record_and_export SERVICE_DOMAIN        ':-cluster.local'
 record_and_export CABPK_MANAGER_IMAGE   ':-'
 record_and_export CAPV_MANAGER_IMAGE    ':-'
 record_and_export VSPHERE_USERNAME      "${ENV_VAR_REQ}"