From c4c40ba862f502f09fab595f9775afb4316cefe9 Mon Sep 17 00:00:00 2001 From: Jingtao Ren Date: Wed, 28 Jun 2017 15:23:58 -0700 Subject: [PATCH] add two default value for classicmode (#889) --- parts/kubernetesparams.t | 2 ++ pkg/acsengine/engine.go | 5 +++++ pkg/acsengine/templates.go | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/parts/kubernetesparams.t b/parts/kubernetesparams.t index 0740c4ab8..20a4c1df5 100644 --- a/parts/kubernetesparams.t +++ b/parts/kubernetesparams.t @@ -17,6 +17,7 @@ "type": "string" }, "caPrivateKey": { + {{PopulateClassicModeDefaultValue "caPrivateKey"}} "metadata": { "description": "The base 64 CA private key used on the master." }, @@ -47,6 +48,7 @@ "type": "securestring" }, "dockerBridgeCidr": { + {{PopulateClassicModeDefaultValue "dockerBridgeCidr"}} "metadata": { "description": "Docker bridge network IP address and subnet" }, diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go index 9d12b981b..47f10dba5 100644 --- a/pkg/acsengine/engine.go +++ b/pkg/acsengine/engine.go @@ -811,6 +811,11 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) map[str val = "10.244.0.0/16" case "kubeBinariesVersion": val = string(api.KubernetesLatest) + case "caPrivateKey": + // The base64 encoded "NotAvailable" + val = "Tm90QXZhaWxhYmxlCg==" + case "dockerBridgeCidr": + val = DefaultDockerBridgeSubnet default: val = "" } diff --git a/pkg/acsengine/templates.go b/pkg/acsengine/templates.go index 84061e7ee..84654ab77 100644 --- a/pkg/acsengine/templates.go +++ b/pkg/acsengine/templates.go @@ -1027,7 +1027,7 @@ func kubernetesmastervarsT() (*asset, error) { return a, nil } -var _kubernetesparamsT = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x97\x41\x6f\xdb\x38\x10\x85\xef\xfd\x15\x03\x9d\xba\x40\xe2\x64\x77\x83\x1e\x72\xeb\xda\x05\x12\x14\x49\x8d\xba\xe8\x65\xb1\x87\x11\x39\xb2\x88\x48\xa4\x3a\x1c\xc5\x75\x5c\xff\xf7\x05\x25\xb9\x52\x63\xd7\x1b\x4b\x2a\xb0\x39\x29\x94\xf8\xf1\xbd\x27\x8a\x9e\x01\x00\x88\xb0\x30\x0b\xe2\x47\xe2\x29\xb1\x98\xc4\x28\x14\x8a\xae\x61\xf3\x0a\xaa\xbf\x28\x27\x41\x8d\x82\x9d\x31\x80\x48\x93\x57\x6c\x0a\x31\xce\x46\xd7\x10\x7d\x4a\x09\x62\xf4\x04\x6f\xae\xc0\x57\x34\x50\x2d\x0e\x4a\x4f\x1a\x9c\x05\x49\x09\x72\xf4\x42\x1c\x35\xa8\xed\xd9\x6e\x1d\x59\x17\x61\xdd\xc8\x0b\x1b\xbb\xac\xef\x37\x77\x5b\x8d\x73\x36\x8f\x28\xf4\x9e\xd6\x63\x48\x2c\x6a\x1a\x3c\xd0\xfa\x80\xc4\xc9\x11\x8d\xa4\x4a\xa6\x43\x4a\x15\x8e\x15\x63\x37\x3f\x2c\x25\x75\x6c\x64\xdd\x1d\x3d\x2d\x42\x85\x23\x65\x37\x7d\xfb\x4b\x72\xcb\x0c\x59\x19\x2d\xbb\x8a\xb6\xbf\x05\xc5\x81\x72\x79\x5e\xda\x7a\x6c\x65\x24\xed\xbd\x27\xeb\x35\x46\x0a\xb5\x11\xbc\x17\x6c\x6f\xc1\x3f\x0d\xfa\xa1\x8c\x69\xea\x6c\x62\x96\xbf\x62\xa3\x56\xa2\xe3\x75\xf0\x33\x6a\xd8\xad\xea\x91\x02\xdf\x4b\x7a\xa8\xe8\x9f\x06\xae\x9d\x7a\x20\xfe\x8b\x8d\x5e\xd2\xd4\x68\x3e\x59\xf6\xac\x02\x40\x5c\x11\xc0\x92\xac\x1c\x3f\xc0\xed\x1c\x50\x6b\x26\xef\x01\xad\x06\x5f\xc6\x96\xa4\x47\xa8\x59\x19\x8c\x3d\x13\xb6\xd9\xcc\x5d\x51\x66\x28\x34\xcd\xd0\x7b\xa3\xee\x9c\xa6\x19\x25\x58\x66\xf2\x19\xb3\x92\xf6\x27\x6f\xb7\x27\x99\x7a\x5f\xc6\xc4\x96\x84\x3c\xa8\x9a\xd2\xdb\x42\x8d\xb9\x59\x17\xc4\xe1\xdf\x45\x41\xea\x74\x2b\x87\x20\x27\x5a\x0a\xdb\x4b\x39\x2b\x68\x6c\x70\x53\x90\x82\xc4\x31\xa4\x3b\xe6\xb1\x73\xf1\xa8\xb5\xb7\x5a\x3b\x7b\x87\x16\x97\xc4\x43\xdc\xed\x71\xfe\x57\x06\x3f\x92\x37\x4f\x23\x18\xec\x72\xc6\x31\x88\x01\x7b\xce\x35\xb7\xb7\xc9\x19\xfa\x34\x76\xc8\x7a\x88\xc3\x1f\x21\xe3\xd8\x6b\xe9\xe7\x7a\x87\x3f\xc7\x5c\xbf\xb9\xea\xed\xf5\xdd\x57\x52\x37\x84\x99\xa4\x4f\x43\xdc\x3e\xc7\x8c\xe3\x97\xbe\x92\x4a\x6b\xea\x40\x9b\x37\x84\x45\x38\xba\x06\x1d\x39\x5d\xc6\x48\x1f\x64\x83\xec\xed\x6b\xee\xf4\xad\x4d\x18\xa7\x3b\xf6\x10\x83\x87\x61\xe3\x38\x2d\x9c\x06\x13\xe0\xbd\xad\x86\xdf\xa1\xd9\xfd\x62\x88\xc1\x2e\x62\xbc\x2f\x52\x5b\x3f\x70\x77\xce\xee\x17\x77\xe8\xbf\x0c\x3a\x6e\x3a\x88\xf1\xac\x9d\x6b\xeb\x73\xf4\x5f\x7a\xf9\xab\xcb\xa9\x77\x76\x69\x2c\xcd\xdc\xca\x66\x0e\xf5\x47\x2a\x5c\xb7\xac\xd2\x1d\x3b\x81\x93\x8a\x14\xfe\xfa\xe2\x02\x0b\xa9\xa7\x4f\xf0\xa9\x64\x22\xbd\xa4\x89\x25\xb9\xe0\x30\xff\xec\x64\x7b\x35\x0b\xa8\xd2\x02\xba\x11\x03\x25\x67\xcf\xce\xd5\x13\x2d\x36\x25\xde\xdc\x65\x46\xad\x8f\xf9\xda\x6c\x26\x1f\x58\xa5\xa1\xec\x44\x71\x3c\x67\x97\x98\x8c\x26\x6d\x6d\x55\x97\xcc\x93\xfb\x2e\x70\xbb\xed\x61\x75\x57\x75\x16\x15\x02\xc8\x26\x8e\x15\xe5\xa1\x67\x11\x17\x0a\x68\x78\x6d\x9d\xa5\x6f\x55\xae\xdf\x14\x66\x46\xb9\xdf\xf6\x5d\x63\x96\xb9\x15\xe9\xca\x80\x8f\xae\xe1\xef\x76\xd1\x30\xfd\xbb\xb0\xf0\x68\x20\x75\x07\x6a\xe8\x8e\xf9\xcf\x8b\x92\x0c\x7d\xbe\x51\x34\x67\x63\x95\x29\x30\x9b\x56\x6d\xd6\xad\x3e\xb9\x06\xaf\x27\xc2\xed\x0c\x5e\xb7\xdd\x82\x2b\x75\xc1\xee\xd1\x68\xe2\x03\x5e\xff\xbb\x33\x38\xac\x6e\x41\x8a\x49\x7a\x35\x37\x8b\x1a\x08\xdf\x89\xd0\xe8\xae\x99\xbd\x1a\xf3\xba\xf1\xf9\x90\x24\xfe\x47\x51\xcf\xf6\xe2\xe5\x0b\xde\xf1\x65\xfb\x36\x7f\x6f\x2f\xff\x68\x2f\xff\x6c\x2f\xaf\xf6\xde\xf3\x8b\x53\x70\x95\x56\x30\x56\x5c\xa7\x75\x83\xc2\xb9\x0c\x56\x29\x31\x85\x2d\xeb\x05\x59\x40\x31\xa1\x18\xbb\xdc\x3d\xf3\xf9\xce\x4f\x00\x3e\xa5\xc6\xc3\x63\x75\x16\x2a\xb4\x10\x13\x24\xec\x72\xb8\x0c\xf3\xae\xce\x20\x2e\x05\xf2\xd2\x4b\xb8\x91\x85\xfe\x4b\x52\xb4\x0d\x61\xea\x4a\x7b\x2c\x67\x63\x9b\x06\x67\xfb\xea\xd5\xbf\x01\x00\x00\xff\xff\x4c\xb6\x1e\xd1\x7e\x13\x00\x00") +var _kubernetesparamsT = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x97\xcf\x6e\xdb\x38\x10\x87\xef\x7d\x8a\x81\x4f\x5d\x20\x71\xb2\xbb\x41\x0f\xb9\x75\xed\x02\x09\x8a\xa4\x46\x5d\xf4\xb2\xd8\xc3\x98\x1c\x59\x44\x24\x52\x1d\x8e\xec\x3a\xae\xdf\x7d\x41\x49\xae\x54\xdb\xf5\x46\x7f\x0a\x6c\x4e\x8a\x24\x7e\x9a\xef\x27\x8a\xe6\x00\x00\x8c\x30\x33\x73\xe2\x15\xf1\x84\x58\x4c\x64\x14\x0a\x8d\x6e\x61\xfb\x0a\x8a\xbf\x51\x4a\x82\x1a\x05\x1b\xe7\x00\x46\x9a\xbc\x62\x93\x89\x71\x76\x74\x0b\xa3\x4f\x31\xc1\x02\x3d\xc1\x9b\x1b\xf0\x05\x0d\x54\x8d\x83\xdc\x93\x06\x67\x41\x62\x82\x14\xbd\x10\x8f\x2a\xd4\xee\x62\xff\x1c\xd9\x64\xe1\xb9\x23\x2f\x6c\xec\xb2\xbc\x5e\x5d\xad\x6b\x9c\xb1\x59\xa1\xd0\x7b\xda\x0c\x51\x62\x56\xd2\xe0\x89\x36\x27\x4a\x1c\x9f\xa9\x91\x54\xce\x74\xaa\x52\x85\x43\xc5\xd8\xcc\x0f\x73\x89\x1d\x1b\xd9\x34\xcf\xb6\x8b\x50\xe1\xc9\xec\xb6\xdb\x99\xcb\xf2\x04\x85\x26\x09\x7a\x6f\xd4\x83\xd3\x34\xa5\x08\xf3\x44\x3e\x63\x92\xd3\xc1\xc8\xdd\xae\xb3\xd0\xe4\xed\x2f\x09\x3c\x31\x64\x65\xb0\xd0\x0b\xda\xf1\xdc\x15\x07\xca\xa5\x69\x6e\xcb\x73\x6b\x23\x71\xe7\xc9\x5c\x3e\x63\xa0\x99\x5c\x15\x7c\x14\x6c\xe7\x82\x7f\x1a\xf4\x53\xbe\xa0\x89\xb3\x91\x59\xfe\x8a\x19\x5e\x14\xbd\xd8\x04\x9f\x41\xc3\xae\xab\x1e\x28\xf0\xa3\xa4\xfb\x16\xfd\xd3\xc0\xb5\x53\x4f\xc4\x7f\xb1\xd1\x4b\x9a\x18\xcd\xed\xbe\xda\xa3\xd1\x2d\xbf\xdc\x69\x31\x1e\x16\x05\x00\x2c\xc9\xda\xf1\x13\xdc\xcf\x00\xb5\x66\xf2\x1e\xd0\x6a\xf0\xf9\xc2\x92\x74\x78\x23\x49\x1e\x52\x69\x6f\x75\x38\xb8\xa5\xd4\xfb\x7c\x41\x6c\x49\xc8\x83\x2a\x29\x9d\x15\x4a\xcc\xdd\x26\x23\x0e\xff\xce\x33\x52\xed\x55\x4e\x41\x3a\xac\xb0\xca\x59\x41\x63\x83\x4d\x46\x0a\x22\xc7\x10\xef\x99\xe7\x16\xd5\xb3\x6a\x6f\xb5\x76\xf6\x01\x2d\x2e\x89\xfb\xd8\x1d\x71\xfe\x57\x82\x1f\xc9\x9b\xe7\x01\x04\x9b\x9c\x61\x04\x31\x60\x2f\xb9\xe4\x76\x96\x9c\xa2\x8f\x17\x0e\x59\xf7\x31\xfc\x11\x32\x8c\x5e\x4d\xbf\xd4\x7b\xfc\x25\xa6\xfa\xcd\x4d\x67\xd7\x77\x5f\x49\xdd\x11\x26\x12\x3f\xf7\xb1\x3d\xc4\x0c\xe3\x4b\x5f\x49\xc5\x25\xb5\xa7\xe6\x1d\x61\x16\x96\xae\x5e\x4b\x4e\x93\x31\xd0\x07\x59\x21\x3b\x7b\xcd\x9c\xbe\xb7\x11\xe3\x64\xcf\xee\x23\x78\x1a\x36\x8c\x69\xe6\x34\x98\x00\xef\xac\x1a\x7e\x87\xa6\x8f\xf3\x3e\x82\x4d\xc4\x70\x5f\xa4\xb6\xbe\xe7\xec\x9c\x3e\xce\x1f\xd0\x7f\xe9\xb5\xdc\x34\x10\xc3\xa9\x5d\x6a\xeb\x53\xf4\x5f\x3a\xf9\x95\xbb\xa9\x77\x76\x69\x2c\x4d\xdd\xda\x26\x0e\xf5\x47\xca\x5c\x73\x2b\xa9\x1b\x3a\x81\x13\x8b\x64\xfe\xf6\xea\x0a\x33\x29\x87\x8f\xf1\x39\x67\x22\xbd\xa4\xb1\x25\xb9\xe2\x30\xfe\xa2\xb5\x5e\xc9\x02\x2a\x6a\x01\x5d\x15\x03\x39\x27\x07\xeb\x6a\x4b\xc5\x6a\x8b\x37\x73\x89\x51\x9b\x73\x5e\xdb\xed\xf8\x03\xab\x38\xec\x59\x51\x1c\xcf\xd8\x45\x26\xa1\x71\xbd\xb7\x2a\xf7\xdb\xe3\xc7\x26\x70\xb7\xeb\xa0\xba\xdf\x75\x66\x05\x02\xc8\x46\x8e\x15\xa5\xa1\xe1\x11\x17\x76\xdf\xf0\xda\x3a\x4b\xdf\x8a\x5c\xbf\x29\x4c\x8c\x72\xbf\x1d\x5b\x63\x92\xb8\x35\xe9\x42\xc0\x8f\x6e\xe1\xef\xfa\xa1\x61\xf8\xf7\xc2\xc2\xad\x81\xd4\x3c\x51\x42\xf7\xcc\x7f\x5e\x94\xa4\x27\x5e\x19\x45\x33\x36\x56\x99\x0c\x93\x49\xd1\xa3\xdd\xeb\xd6\x7d\x47\x39\x10\xee\xa7\xf0\xba\x6e\x35\x5c\xae\x33\x76\x2b\xa3\x89\x4f\xb8\xfe\x77\x5b\x71\xba\xba\x39\x29\x26\xe9\xd4\x19\xcd\x4b\x20\x7c\x27\x42\x55\x77\xc9\xec\xd4\xd5\x97\x5d\xd3\x87\x28\xf2\x3f\x16\x75\x30\x17\xaf\x5f\xf0\x8e\xaf\xeb\xb7\xf9\x7b\x7d\xf8\x47\x7d\xf8\x67\x7d\x78\x73\xf4\x9e\x5f\x9c\x82\x2b\x6a\x05\x63\xc5\x35\xfa\x3e\xc8\x9c\x4b\x60\x1d\x13\x53\x98\xb2\x5e\x90\x05\x14\x13\x8a\xb1\xcb\xfd\x3d\x9f\x1f\xfc\x18\xe0\x53\x6c\x3c\xac\x8a\xb5\x50\xa1\x85\x05\x41\xc4\x2e\x85\xeb\x30\xee\xe6\x02\x16\xb9\x40\x9a\x7b\x09\x17\x92\xd0\x7f\x49\x8c\xb6\x22\x4c\x5c\x6e\xcf\xe5\x6c\x6c\xd5\xe0\xec\x5e\xbd\xfa\x37\x00\x00\xff\xff\x07\x20\x35\xe5\xf4\x13\x00\x00") func kubernetesparamsTBytes() ([]byte, error) { return bindataRead(