mirror of https://github.com/kubernetes/kops.git
add parameter --no-associate-public-ip
This commit is contained in:
parent
d0fd8170cd
commit
a860fdbdfd
|
@ -33,6 +33,7 @@ type CreateClusterCmd struct {
|
||||||
NetworkCIDR string
|
NetworkCIDR string
|
||||||
DNSZone string
|
DNSZone string
|
||||||
AdminAccess string
|
AdminAccess string
|
||||||
|
AssociatePublicIP bool
|
||||||
}
|
}
|
||||||
|
|
||||||
var createCluster CreateClusterCmd
|
var createCluster CreateClusterCmd
|
||||||
|
@ -80,6 +81,8 @@ func init() {
|
||||||
cmd.Flags().StringVar(&createCluster.DNSZone, "dns-zone", "", "DNS hosted zone to use (defaults to last two components of cluster name)")
|
cmd.Flags().StringVar(&createCluster.DNSZone, "dns-zone", "", "DNS hosted zone to use (defaults to last two components of cluster name)")
|
||||||
cmd.Flags().StringVar(&createCluster.OutDir, "out", "", "Path to write any local output")
|
cmd.Flags().StringVar(&createCluster.OutDir, "out", "", "Path to write any local output")
|
||||||
cmd.Flags().StringVar(&createCluster.AdminAccess, "admin-access", "", "Restrict access to admin endpoints (SSH, HTTPS) to this CIDR. If not set, access will not be restricted by IP.")
|
cmd.Flags().StringVar(&createCluster.AdminAccess, "admin-access", "", "Restrict access to admin endpoints (SSH, HTTPS) to this CIDR. If not set, access will not be restricted by IP.")
|
||||||
|
|
||||||
|
cmd.Flags().BoolVar(&createCluster.AssociatePublicIP, "no-associate-public-ip", true, "Specify --no-associate-public-ip to disable association of public IP for master ASG and nodes.")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *CreateClusterCmd) Run(args []string) error {
|
func (c *CreateClusterCmd) Run(args []string) error {
|
||||||
|
@ -354,6 +357,9 @@ func (c *CreateClusterCmd) Run(args []string) error {
|
||||||
fmt.Println("Previewing changes that will be made:\n")
|
fmt.Println("Previewing changes that will be made:\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
glog.V(1).Info("Associate Public IP: %v", c.AssociatePublicIP)
|
||||||
|
fullCluster.Spec.AssociatePublicIP = &c.AssociatePublicIP
|
||||||
|
|
||||||
applyCmd := &cloudup.ApplyClusterCmd{
|
applyCmd := &cloudup.ApplyClusterCmd{
|
||||||
Cluster: fullCluster,
|
Cluster: fullCluster,
|
||||||
InstanceGroups: fullInstanceGroups,
|
InstanceGroups: fullInstanceGroups,
|
||||||
|
|
|
@ -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: true
|
associatePublicIP: {{ AssociatePublicIP }}
|
||||||
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" }}
|
||||||
|
|
|
@ -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: true
|
associatePublicIP: {{ AssociatePublicIP }}
|
||||||
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" }}
|
||||||
|
|
|
@ -103,6 +103,8 @@ type ClusterSpec struct {
|
||||||
// * enable debugging handlers on the master, so kubectl logs works
|
// * enable debugging handlers on the master, so kubectl logs works
|
||||||
IsolateMasters *bool `json:"isolateMasters,omitempty"`
|
IsolateMasters *bool `json:"isolateMasters,omitempty"`
|
||||||
|
|
||||||
|
AssociatePublicIP *bool `json:"associatePublicIp,omitempty"`
|
||||||
|
|
||||||
//NetworkProvider string `json:",omitempty"`
|
//NetworkProvider string `json:",omitempty"`
|
||||||
//
|
//
|
||||||
//HairpinMode string `json:",omitempty"`
|
//HairpinMode string `json:",omitempty"`
|
||||||
|
|
Loading…
Reference in New Issue