Merge pull request #339 from km4rcus/cluster-domain-option

manifests/coredns.yaml

@@ -55,7 +55,7 @@ data:
     .:53 {
         errors
         health
-        kubernetes cluster.local in-addr.arpa ip6.arpa {
+        kubernetes %{CLUSTER_DOMAIN}% in-addr.arpa ip6.arpa {
           pods insecure
           upstream
           fallthrough in-addr.arpa ip6.arpa

pkg/agent/config/config.go

@@ -225,6 +225,7 @@ func get(envInfo *cmds.Agent) (*config.Node, error) {
 	nodeConfig.AgentConfig.NodeIP = nodeIP
 	nodeConfig.AgentConfig.NodeName = nodeName
 	nodeConfig.AgentConfig.ClusterDNS = controlConfig.ClusterDNS
+	nodeConfig.AgentConfig.ClusterDomain = controlConfig.ClusterDomain
 	nodeConfig.AgentConfig.ResolvConf = locateOrGenerateResolvConf(envInfo)
 	nodeConfig.AgentConfig.CACertPath = clientCA
 	nodeConfig.AgentConfig.ListenAddress = "127.0.0.1"

pkg/cli/cmds/server.go

@@ -10,6 +10,7 @@ type Server struct {
 	ClusterSecret       string
 	ServiceCIDR         string
 	ClusterDNS          string
+	ClusterDomain       string
 	HTTPSPort           int
 	HTTPPort            int
 	DataDir             string
@@ -89,6 +90,12 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
 				Destination: &ServerConfig.ClusterDNS,
 				Value:       "",
 			},
+			cli.StringFlag{
+				Name:        "cluster-domain",
+				Usage:       "Cluster Domain",
+				Destination: &ServerConfig.ClusterDomain,
+				Value:       "cluster.local",
+			},
 			cli.StringSliceFlag{
 				Name:  "no-deploy",
 				Usage: "Do not deploy packaged components (valid items: coredns, servicelb, traefik)",

pkg/cli/server/server.go

@@ -100,6 +100,7 @@ func run(app *cli.Context, cfg *cmds.Server) error {
 	serverConfig.ControlConfig.ExtraAPIArgs = cfg.ExtraAPIArgs
 	serverConfig.ControlConfig.ExtraControllerArgs = cfg.ExtraControllerArgs
 	serverConfig.ControlConfig.ExtraSchedulerAPIArgs = cfg.ExtraSchedulerArgs
+	serverConfig.ControlConfig.ClusterDomain = cfg.ClusterDomain
 
 	_, serverConfig.ControlConfig.ClusterIPRange, err = net2.ParseCIDR(cfg.ClusterCIDR)
 	if err != nil {

pkg/daemons/agent/agent.go

@@ -56,7 +56,7 @@ func kubelet(cfg *config.Agent) {
 		"healthz-bind-address":     "127.0.0.1",
 		"read-only-port":           "0",
 		"allow-privileged":         "true",
-		"cluster-domain":           "cluster.local",
+		"cluster-domain":           cfg.ClusterDomain,
 		"kubeconfig":               cfg.KubeConfig,
 		"eviction-hard":            "imagefs.available<5%,nodefs.available<5%",
 		"eviction-minimum-reclaim": "imagefs.available=10%,nodefs.available=10%",

pkg/daemons/config/types.go

@@ -38,6 +38,7 @@ type Agent struct {
 	NodeName           string
 	ClusterCIDR        net.IPNet
 	ClusterDNS         net.IP
+	ClusterDomain      string
 	ResolvConf         string
 	RootDir            string
 	KubeConfig         string
@@ -58,6 +59,7 @@ type Control struct {
 	ClusterIPRange        *net.IPNet
 	ServiceIPRange        *net.IPNet
 	ClusterDNS            net.IP
+	ClusterDomain         string
 	NoCoreDNS             bool
 	KubeConfigOutput      string
 	KubeConfigMode        string

pkg/deploy/zz_generated_bindata.go

@@ -69,7 +69,7 @@ func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
-var _corednsYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x56\xdd\x6e\x1b\xb7\x12\xbe\xd7\x53\x10\x7b\x90\xbb\xb3\xb2\x04\x23\x39\x3e\xbc\x4b\x24\x37\x35\x90\xb8\x82\x65\xe7\xa6\x28\x82\x11\x77\x24\xb1\xe6\x72\x58\x72\x56\xb1\x9a\xe6\xdd\x0b\xee\x9f\xb9\xf2\x3a\x48\x82\xec\xcd\x92\x1c\xce\x37\xe4\xfc\x7c\x43\x70\xfa\x03\xfa\xa0\xc9\x4a\x71\x98\x4f\xee\xb5\x2d\xa4\x58\xa3\x3f\x68\x85\xaf\x95\xa2\xca\xf2\xa4\x44\x86\x02\x18\xe4\x44\x08\x0b\x25\x4a\xa1\xc8\x63\x61\x43\x3b\x0f\x0e\x14\x4a\x71\x5f\x6d\x30\x0f\xc7\xc0\x58\x4e\xf2\x3c\x9f\xa4\xd0\x7e\x03\x6a\x0a\x15\xef\xc9\xeb\xbf\x81\x35\xd9\xe9\xfd\x45\x98\x6a\x3a\x3b\xcc\x37\xc8\xd0\x59\x5e\x98\x2a\x30\xfa\x1b\x32\x38\x30\x6b\x60\x83\x26\xc4\x91\xa8\xed\x78\x8b\x8c\xb5\xfe\x86\x88\x03\x7b\x70\x4e\xdb\x5d\x63\x28\x2f\x70\x0b\x95\xe1\xd0\x9f\xb7\x39\x95\xec\x8e\xed\x2b\x83\x41\x4e\x72\x01\x4e\xbf\xf5\x54\xb9\x1a\x39\x17\x59\x36\x11\xc2\x63\xa0\xca\x2b\x6c\xd7\xd0\x16\x8e\xb4\xad\xc1\x72\x11\x1a\xcf\x34\x13\x47\x45\x33\xe8\x9d\x10\xa7\x07\xf4\x9b\x56\xd7\xe8\xc0\xf5\xe0\x13\xb0\xda\x7f\x9b\x3d\x4b\xc5\x29\xcc\x0e\xf9\x67\x38\xf4\x8d\xb6\x85\xb6\xbb\x81\x5f\xc1\x5a\xe2\x5a\xbd\x75\xee\x18\xee\xc0\xdf\x50\x31\x55\xae\x00\x46\x29\x32\xf6\x15\x66\x3f\x3f\x3c\x64\xf0\x06\xb7\xf5\xf9\x5a\x87\x7d\xe5\xc2\x13\x21\x9e\xe6\xce\x33\xc8\xa1\xda\xfc\x89\x8a\xeb\xd8\x8f\xa6\xfa\x0f\x27\x78\x5f\x3b\x0b\xb2\x5b\xbd\x7b\x0f\xee\x47\xca\xa6\xdb\xbe\x20\x8f\x5b\x6d\x50\x8a\x7f\x6a\x9f\x4e\xe5\xcb\x73\xf1\xb9\x1e\xc6\x0f\xbd\x27\x1f\xfa\xe9\x1e\xc1\xf0\xbe\x9f\x3e\x06\x40\xa8\xc6\x25\x53\x43\x0a\x8c\xd0\x36\x87\xa2\xf0\x53\xf0\x0e\x84\x76\xaf\x9a\xc1\x23\xac\xa8\x33\x5a\x68\x1b\x50\x55\x1e\x93\xf5\xca\x05\xf6\x08\x65\xb2\xb4\x05\x63\x78\xef\xa9\xda\xed\xc7\x81\xfb\xbd\x5f\xfa\x91\xf3\x54\x22\xef\xb1\x0a\x42\xfe\x7f\xfe\xf2\x3c\x15\x3c\x1c\xc5\x54\x9c\x21\xab\xb3\x58\x10\xe6\x30\x55\x64\xb7\xfd\x06\x05\x6a\x8f\xe2\x7c\xd6\x2f\x18\x22\xd7\x4f\x3c\x1a\x82\x22\x91\x41\xb1\x01\x03\x56\x35\x77\xf8\xf2\x24\x5a\xf8\xc0\x68\xe3\x30\x9c\x94\xcb\x12\x9d\xa1\x63\x89\x3f\xc6\x7a\x27\x85\x70\x11\x72\x70\xae\xdd\xd2\x28\x9e\x96\x47\x03\x9c\xc5\x78\x2f\xaf\xd7\xd9\x24\x38\x54\x51\xfb\x3f\x1e\x9d\xd1\x0a\x82\x14\xf3\x89\x10\xb1\x82\x18\x77\xc7\x06\x98\x8f\x0e\xa5\xb8\x21\x63\xb4\xdd\xdd\xd5\xb5\xd8\xd4\x6e\xba\x22\x5b\x77\x94\xf0\x70\x67\xe1\x00\xda\xc0\x26\x26\x54\x0d\x87\x06\x15\x93\x6f\xf6\x94\x91\x9c\xde\x25\x07\x1f\x3f\x3a\x63\xe9\x4c\x0f\x9c\x7a\xa7\xf6\xf9\x40\xff\xb9\xcb\x77\xd7\xab\xc7\x83\xca\xbb\x3e\xf1\x70\x7d\x4f\x32\xe8\x53\x72\x8a\x5f\x2e\xee\xf1\x18\x5d\xe6\x35\x6b\x05\xe6\x75\x51\x90\x0d\xbf\x59\x73\xcc\x92\xec\x24\x17\x35\xc9\x4b\x91\x5d\x3e\xe8\xc0\xa1\x13\x46\x7a\x5d\x0f\xae\x1f\xbf\x98\x02\x27\x3c\x47\x41\x0a\xa3\x6d\xf5\xd0\x6e\x52\x64\x19\xb4\x45\xdf\x9f\x25\x7f\x92\x16\xcd\xa7\x4b\xd8\x3d\x2e\x9f\xb5\x7f\x39\x9f\x9e\x4f\x67\xc3\x4d\xab\xca\x98\x15\x19\xad\x8e\x52\x5c\x6d\xaf\x89\x57\x1e\x03\xd6\x34\xd4\x25\x76\xd2\x1b\xfa\xf4\xd6\xa5\xe6\xc1\x4a\x0c\x47\x49\xfe\x28\xc5\xfc\x7f\xb3\xf7\x3a\x91\x78\xfc\xab\xc2\x70\xba\x5b\xb9\x4a\x8a\xf9\x6c\x56\x8e\x62\x0c\x20\xc0\xef\x82\x14\xbf\x8b\x2c\x8f\xf5\x98\xfd\x57\x64\x75\x8d\x76\x97\xeb\x88\x2a\x13\x7f\xf4\x2a\x07\x32\x55\x89\xef\x63\x54\x07\x71\xeb\xbc\x15\xf9\x31\x6f\x36\x25\xf6\xcb\xb8\x7f\x05\xbc\x97\x22\xb5\x30\xb8\x0b\x14\x31\xce\x52\xc4\xb6\xf3\xc8\x1d\xe4\x87\x76\xfa\x48\xad\xc8\xb3\x14\x09\xcd\x74\x85\x3c\xc4\x75\x9e\x98\x14\x19\x29\xee\x96\xab\xef\xc5\xc9\x59\xb9\x51\xac\xdb\xc5\x57\xb0\x06\xe4\xd7\xa1\x95\xc8\x5e\xab\xf1\x93\xa5\x68\x35\x3b\x6b\x3e\x2e\xc8\x32\x3e\x70\x1a\x5a\x30\x86\x3e\xad\xbc\x3e\x68\x83\x3b\xbc\x0c\x0a\x4c\x5d\x3f\x32\xd2\x75\x48\xdd\xad\xc0\xc1\x46\x1b\xcd\x1a\x4f\x92\x03\x8a\x62\xb8\x90\x8b\xeb\xcb\xdb\x8f\x6f\xae\xae\x97\x1f\xd7\x97\x37\x1f\xae\x16\x97\x03\x71\xe1\xc9\x9d\x2a\x80\x31\x23\x81\xbb\x21\xe2\x5f\xb4\xc1\xb6\x29\x0f\xc3\x68\xf4\x01\x2d\x86\xb0\xf2\xb4\xc1\x14\x6f\xcf\xec\xde\x22\x0f\x4d\xb8\x26\x51\x4e\x3a\x9f\x68\xd3\x41\x8a\x8b\xd9\xc5\x6c\xb0\x1c\xd4\x1e\xa3\x93\x7f\xbd\xbd\x5d\x25\x02\x6d\x35\x6b\x30\x4b\x34\x70\x5c\xa3\x22\x5b\x04\x29\x5e\xa5\xaa\xac\x4b\xa4\x8a\x7b\xe1\xcb\x44\x16\x2a\xa5\x30\x84\xdb\xbd\xc7\xb0\x27\x53\x34\xec\xda\x7d\x5b\xd0\xa6\xf2\x98\x48\x3b\xdd\xc2\x86\xae\xec\x97\xcd\x5b\xa8\x15\x34\x55\xf1\x1d\x55\xa3\xba\xd7\xc6\xd0\x3d\xe3\xc4\x54\x5f\x98\xb1\x0c\xa7\xe1\xaa\x19\xb5\x2b\xe5\x81\xac\xf3\x74\x2f\x7c\xf6\xdd\xd3\x3e\xa4\x46\xda\x66\xd2\x01\x9e\xed\x9b\x4f\xde\xa1\x8f\x4f\x85\x48\xc6\x4d\x50\xb3\x58\x36\xd9\x88\x38\x28\x0f\xee\xd9\xf7\xe8\x37\xb4\xe1\xf6\x9d\x94\xb7\x3d\x29\x41\xfa\xd6\x86\x3d\x6c\xa9\x63\x36\x5b\x1b\x57\x2b\x29\x5e\x7c\x5e\xbc\xbb\x5b\xdf\x5e\xde\x7c\x5c\x5e\xaf\xbf\xbc\x98\x24\x24\x96\x9f\x50\x94\x4b\xb9\xe7\x94\xa9\xf2\x11\x1e\x7a\x46\xa1\x21\x90\x7c\x84\x6a\xdc\x90\x91\x86\x2a\xff\x06\x00\x00\xff\xff\xb5\xed\x36\x67\x1f\x0e\x00\x00")
+var _corednsYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x56\x4d\x6f\xdb\x38\x13\xbe\xfb\x57\x10\x7a\xd1\xdb\x2b\xc7\x46\xd0\x6e\x96\xb7\xd6\xce\x76\x03\x34\xae\x11\x27\xbd\x2c\x16\x05\x4d\x8d\x2d\x6e\x28\x0e\x97\x1c\xb9\xf1\x76\xf3\xdf\x17\xd4\x57\x28\x45\x2e\xda\xa0\xba\x88\xe4\x70\x9e\x21\xe7\xe3\x19\x0a\xab\x3e\x81\xf3\x0a\x0d\x67\x87\xf9\xe4\x5e\x99\x8c\xb3\x0d\xb8\x83\x92\xf0\x56\x4a\x2c\x0d\x4d\x0a\x20\x91\x09\x12\x7c\xc2\x98\x11\x05\x70\x26\xd1\x41\x66\x7c\x33\xf7\x56\x48\xe0\xec\xbe\xdc\x42\xea\x8f\x9e\xa0\x98\xa4\x69\x3a\x89\xa1\xdd\x56\xc8\xa9\x28\x29\x47\xa7\xfe\x11\xa4\xd0\x4c\xef\x2f\xfc\x54\xe1\xd9\x61\xbe\x05\x12\xad\xe5\x85\x2e\x3d\x81\xbb\x41\x0d\x3d\xb3\x5a\x6c\x41\xfb\x30\x62\x95\x1d\x67\x80\xa0\xd2\xdf\x22\x92\x27\x27\xac\x55\x66\x5f\x1b\x4a\x33\xd8\x89\x52\x93\xef\xce\x5b\x9f\x8a\xb7\xc7\x76\xa5\x06\xcf\x27\x29\x13\x56\xbd\x77\x58\xda\x0a\x39\x65\x49\x32\x61\xcc\x81\xc7\xd2\x49\x68\xd6\xc0\x64\x16\x95\xa9\xc0\x52\xe6\x6b\xcf\xd4\x13\x8b\x59\x3d\xe8\x9c\x10\xa6\x07\x70\xdb\x46\x57\x2b\x4f\xd5\xe0\x8b\x20\x99\x7f\x9f\x3d\x83\xd9\x10\x66\x0f\xf4\x33\x1c\xfa\x4e\x99\x4c\x99\x7d\xcf\xaf\xc2\x18\xa4\x4a\xbd\x71\xee\x18\x6e\xcf\xdf\xa2\x24\x2c\x6d\x26\x08\x38\x4b\xc8\x95\x90\xfc\xfc\xf0\xa0\x86\x1b\xd8\x55\xe7\x6b\x1c\xf6\x8d\x0b\x4f\x18\x7b\x9e\x3b\x27\x90\x7d\xb9\xfd\x0b\x24\x55\xb1\x1f\x4d\xf5\x17\x27\x78\x57\x3b\x0b\x34\x3b\xb5\xbf\x16\xf6\x25\x65\xd3\x6e\x5f\xa0\x83\x9d\xd2\xc0\xd9\xbf\x95\x4f\xa7\xfc\xf5\x39\xfb\x5a\x0d\xc3\x07\xce\xa1\xf3\xdd\x34\x07\xa1\x29\xef\xa6\x4f\x01\x60\xaf\xbe\x2e\x3e\xdc\x6d\x6e\x2f\x6f\x3e\x2f\x3f\x5e\xbf\xbd\x5a\x3d\xbe\x62\xca\xa4\x22\xcb\xdc\x54\x38\x2b\x98\xb2\x6f\xea\xc1\x13\x36\xab\xd2\x9a\x29\xe3\x41\x96\x0e\xa2\xf5\xd2\x7a\x72\x20\x8a\x68\x69\x27\xb4\xa6\xdc\x61\xb9\xcf\xc7\x81\xbb\xbd\x8f\xdd\xc8\x3a\x2c\x80\x72\x28\x3d\xe3\xbf\xce\x5f\x9f\xc7\x82\x87\x23\x9b\xb2\x33\x20\x79\x16\xaa\x42\x1f\xa6\x12\xcd\xae\xdb\x20\x85\xcc\x81\x9d\xcf\xba\x05\x8d\x68\xbb\x89\x03\x8d\x22\x8b\x64\x22\xdb\x0a\x2d\x8c\xac\xef\xf0\xf8\x2c\x64\xf0\x40\x60\xc2\xd0\x0f\x6a\x66\x09\x56\xe3\xb1\x80\x97\x51\xdf\xa0\x1a\x2e\x7c\x2a\xac\x6d\xb6\xd4\x8a\xc3\x1a\xa9\x81\x93\x10\xf4\xe5\x6a\x93\x4c\xbc\x05\x19\xb4\xff\xe7\xc0\x6a\x25\x85\xe7\x6c\x3e\x61\x2c\x94\x11\xc1\xfe\x58\x03\xd3\xd1\x02\x67\x37\xa8\xb5\x32\xfb\xbb\xaa\x20\xeb\x02\x8e\x57\x78\xe3\x8e\x42\x3c\xdc\x19\x71\x10\x4a\x8b\x6d\xc8\xaa\x0a\x0e\x34\x48\x42\x57\xef\x29\x02\x43\x7d\x88\x0e\x3e\x7e\x74\x82\xc2\xea\x0e\x38\xf6\x4e\xe5\xf3\x9e\xfe\xa9\xcb\xb7\xd7\xab\xc6\xbd\xf2\x5b\x0d\x3c\x5c\xdd\x13\x35\xb8\x98\xa1\xc2\x97\xb2\x7b\x38\x06\x97\x39\x45\x4a\x0a\xfd\x36\xcb\xd0\xf8\x8f\x46\x1f\x93\x28\x3b\xd1\x06\x4d\x74\x9c\x25\x97\x0f\xca\x93\x6f\x85\x81\x63\x37\xbd\xeb\x87\x2f\xa4\xc0\x80\xec\xd0\x73\xa6\x95\x29\x1f\x9a\x4d\x12\x0d\x09\x65\xc0\x75\x67\x49\x9f\xa5\x45\xfd\xa9\x42\xec\x9f\x96\xcf\x9a\x3f\x9f\x4f\xcf\xa7\xb3\xfe\xa6\x75\xa9\xf5\x1a\xb5\x92\x47\xce\xae\x76\x2b\xa4\xb5\x03\x0f\x15\x17\xb5\x89\x1d\x35\x88\x2e\xbd\x55\xa1\xa8\xb7\x12\xc2\x51\xa0\x3b\x72\x36\xff\x65\x76\xad\x22\x89\x83\xbf\x4b\xf0\xc3\xdd\xd2\x96\x9c\xcd\x67\xb3\x62\x14\xa3\x07\x21\xdc\xde\x73\xf6\x07\x4b\xd2\x50\x8f\xc9\xff\x59\x52\xd5\x68\x7b\xb9\x96\xad\x12\xf6\x67\xa7\x72\x40\x5d\x16\x70\x1d\xa2\xda\x8b\x5b\xeb\xad\x40\x92\x69\xbd\x29\xb2\x5f\x84\xfd\x6b\x41\x39\x67\xb1\x85\xde\x5d\x44\x16\xe2\xcc\x59\xe8\x3d\x4f\xdc\x81\xae\x6f\xa7\x8b\xd4\x1a\x1d\x71\x16\xd1\x4c\x5b\xc8\x7d\x5c\xeb\x90\x50\xa2\xe6\xec\x6e\xb9\xfe\x51\x9c\x94\xa4\x1d\xc5\xba\x5d\x7c\x03\xab\x47\x7e\x2d\x5a\x01\xe4\x94\x1c\x3f\x59\x8c\x56\xb1\xb3\xa2\xe3\x02\x0d\xc1\x03\xc5\xa1\x15\x5a\xe3\x97\xb5\x53\x07\xa5\x61\x0f\x97\x5e\x0a\x5d\xd5\x0f\x0f\x74\xed\x63\x77\x4b\x61\xc5\x56\x69\x45\x0a\x06\xc9\x21\xb2\xac\xbf\x90\xb2\xd5\xe5\xed\xe7\x77\x57\xab\xe5\xe7\xcd\xe5\xcd\xa7\xab\xc5\x65\x4f\x9c\x39\xb4\x43\x05\xa1\xf5\x48\xe0\x6e\x10\xe9\x37\xa5\xa1\xe9\xcc\xfd\x30\x6a\x75\x00\x03\xde\xaf\x1d\x6e\x21\xc6\xcb\x89\xec\x7b\xa0\xbe\x09\x5b\x27\xca\xa0\xfd\xb1\x26\x1d\x38\xbb\x98\x5d\xcc\x7a\xcb\x5e\xe6\x10\x9c\xfc\xfb\xed\xed\x3a\x12\x28\xa3\x48\x09\xbd\x04\x2d\x8e\x1b\x90\x68\x32\xcf\xd9\x9b\x58\x95\x54\x01\x58\x52\x27\x7c\x1d\xc9\x7c\x29\x25\x78\x7f\x9b\x3b\xf0\x39\xea\xac\x66\xd7\xf6\xdb\x09\xa5\x4b\x07\x91\xb4\xd5\xcd\x8c\x6f\xcb\x7e\x59\x3f\x88\x1a\x41\x5d\x15\x3f\x50\x35\xb2\x7d\x72\xf4\xdd\x33\x4e\x4c\xd5\x85\x09\x0a\x3f\x0c\x57\xc5\xa8\x6d\x29\xf7\x64\xad\xa7\x3b\xe1\xc9\xc7\x4f\xf3\x9a\x1a\x69\x9b\x51\x07\x38\xd9\x37\x9f\x3d\x46\x9f\x9e\x0a\x81\x8c\xeb\xa0\x26\xa1\x6c\x92\x11\xb1\x97\x4e\xd8\x93\x8f\xd2\xef\x68\xc3\xb2\x7e\x3f\xa6\x4d\x4f\x8a\x90\xbe\xb7\x61\xf7\x5b\xea\x98\xcd\xc6\xc6\xd5\x9a\xc7\x6f\xb3\xd5\xe6\xf1\xd5\x24\x22\xb1\x74\x40\x51\x36\xe6\x9e\x21\x53\xa5\x23\x3c\x74\x42\xa1\x26\x90\x74\x84\x6a\x6c\x9f\x91\xfa\x2a\xff\x05\x00\x00\xff\xff\xcd\x5f\xed\xd4\x24\x0e\x00\x00")
 
 func corednsYamlBytes() ([]byte, error) {
 	return bindataRead(

pkg/server/server.go

@@ -123,7 +123,7 @@ func startNorman(ctx context.Context, config *Config) (string, error) {
 			},
 			func(ctx context.Context) error {
 				dataDir := filepath.Join(controlConfig.DataDir, "manifests")
-				templateVars := map[string]string{"%{CLUSTER_DNS}%": controlConfig.ClusterDNS.String()}
+				templateVars := map[string]string{"%{CLUSTER_DNS}%": controlConfig.ClusterDNS.String(), "%{CLUSTER_DOMAIN}%": controlConfig.ClusterDomain}
 				if err := deploy.Stage(dataDir, templateVars, controlConfig.Skips); err != nil {
 					return err
 				}