Merge pull request #419 from justinsb/default_public_ip

Default AssociatePublicIP to true
This commit is contained in:
Justin Santa Barbara 2016-09-09 11:09:39 -04:00 committed by GitHub
commit 41ecced1ed
4 changed files with 18 additions and 10 deletions

View File

@ -91,6 +91,14 @@ func (c *UpdateClusterCmd) Run(args []string) error {
return err
}
for i, g := range fullInstanceGroups {
fullGroup, err := cloudup.PopulateInstanceGroupSpec(cluster, g)
if err != nil {
return err
}
fullInstanceGroups[i] = fullGroup
}
if c.SSHPublicKey != "" {
fmt.Fprintf(os.Stderr, "--ssh-public-key on update is deprecated - please use `kops create secret --name %s sshpublickey admin -i ~/.ssh/id_rsa.pub` instead\n", cluster.Name)

View File

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

View File

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

View File

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