kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix logic around `or nillable true` in text template 

A false value is also treated as false, so the expression will always be
true
This commit is contained in:
Justin Santa Barbara 2016-09-09 11:35:49 -04:00
parent 41ecced1ed
commit b9c20a7c0d
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
upup/models/bindata.go
View File

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

2
upup/models/cloudup/_aws/master/_master_asg/master_asg.yaml
View File

@ -8,7 +8,7 @@ launchConfiguration/{{ $m.Name }}.masters.{{ ClusterName }}:
iamInstanceProfile: iamInstanceProfile/masters.{{ ClusterName }} iamInstanceProfile: iamInstanceProfile/masters.{{ ClusterName }}
imageId: {{ $m.Spec.Image }} imageId: {{ $m.Spec.Image }}
instanceType: {{ $m.Spec.MachineType }} instanceType: {{ $m.Spec.MachineType }}
associatePublicIP: {{ or $m.Spec.AssociatePublicIP true }} associatePublicIP: {{ WithDefaultBool $m.Spec.AssociatePublicIP true }}
userData: resources/nodeup.sh _kubernetes_master userData: resources/nodeup.sh _kubernetes_master
rootVolumeSize: {{ or $m.Spec.RootVolumeSize "20" }} rootVolumeSize: {{ or $m.Spec.RootVolumeSize "20" }}
rootVolumeType: {{ or $m.Spec.RootVolumeType "gp2" }} rootVolumeType: {{ or $m.Spec.RootVolumeType "gp2" }}

2
upup/models/cloudup/_aws/nodes.yaml
View File

@ -52,7 +52,7 @@ launchConfiguration/{{ $nodeset.Name }}.{{ ClusterName }}:
iamInstanceProfile: iamInstanceProfile/nodes.{{ ClusterName }} iamInstanceProfile: iamInstanceProfile/nodes.{{ ClusterName }}
imageId: {{ $nodeset.Spec.Image }} imageId: {{ $nodeset.Spec.Image }}
instanceType: {{ $nodeset.Spec.MachineType }} instanceType: {{ $nodeset.Spec.MachineType }}
associatePublicIP: {{ or $nodeset.Spec.AssociatePublicIP true }} associatePublicIP: {{ WithDefaultBool $nodeset.Spec.AssociatePublicIP true }}
userData: resources/nodeup.sh _kubernetes_pool userData: resources/nodeup.sh _kubernetes_pool
rootVolumeSize: {{ or $nodeset.Spec.RootVolumeSize "20" }} rootVolumeSize: {{ or $nodeset.Spec.RootVolumeSize "20" }}
rootVolumeType: {{ or $nodeset.Spec.RootVolumeType "gp2" }} rootVolumeType: {{ or $nodeset.Spec.RootVolumeType "gp2" }}

6
upup/pkg/fi/cloudup/template_functions.go
View File

@ -84,6 +84,12 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap) {
dest["IAMNodePolicy"] = func() (string, error) { dest["IAMNodePolicy"] = func() (string, error) {
return tf.buildAWSIAMPolicy(api.InstanceGroupRoleNode) return tf.buildAWSIAMPolicy(api.InstanceGroupRoleNode)
} }
dest["WithDefaultBool"] = func(v *bool, defaultValue bool) bool {
if v != nil {
return *v
}
return defaultValue
}
} }
func (tf *TemplateFunctions) EtcdClusterMemberTags(etcd *api.EtcdClusterSpec, m *api.EtcdMemberSpec) map[string]string { func (tf *TemplateFunctions) EtcdClusterMemberTags(etcd *api.EtcdClusterSpec, m *api.EtcdMemberSpec) map[string]string {