Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make the AdminAccess default inclusive of IPv6 #11763

Merged
merged 2 commits into from
Jun 15, 2021
Merged

Make the AdminAccess default inclusive of IPv6 #11763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1356818
Make the AdminAccess default inclusive of IPv6
johngmyers Jun 15, 2021
9d531ed
hack/update-expected.sh
johngmyers Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/kops/create_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
cmd.Flags().StringVar(&options.DNSZone, "dns-zone", options.DNSZone, "DNS hosted zone to use (defaults to longest matching zone)")
cmd.Flags().StringVar(&options.OutDir, "out", options.OutDir, "Path to write any local output")
cmd.Flags().StringSliceVar(&options.AdminAccess, "admin-access", options.AdminAccess, "Restrict API access to this CIDR. If not set, access will not be restricted by IP.")
cmd.Flags().StringSliceVar(&options.SSHAccess, "ssh-access", options.SSHAccess, "Restrict SSH access to this CIDR. If not set, access will not be restricted by IP. (default [0.0.0.0/0])")
cmd.Flags().StringSliceVar(&options.SSHAccess, "ssh-access", options.SSHAccess, "Restrict SSH access to this CIDR. If not set, uses the value of the admin-access flag.")

// TODO: Can we deprecate this flag - it is awkward?
cmd.Flags().BoolVar(&associatePublicIP, "associate-public-ip", false, "Specify --associate-public-ip=[true|false] to enable/disable association of public IP for master ASG and nodes. Default is 'true'.")
Expand Down
4 changes: 2 additions & 2 deletions docs/cli/kops_create_cluster.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tests/integration/create_cluster/complex/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.complex.example.com
networkCIDR: 172.20.0.0/16
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.gce.example.com
networking:
Expand All @@ -41,6 +42,7 @@ spec:
project: testproject
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- name: us-test1
region: us-test1
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/ha/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.ha.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -53,6 +54,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.ha.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -53,6 +54,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.ha-gce.example.com
networking:
Expand All @@ -49,6 +50,7 @@ spec:
project: testproject
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- name: us-test1
region: us-test1
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.ha.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -53,6 +54,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.ha.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -65,6 +66,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.private.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -43,6 +44,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
egress: i-09123456
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.22.0
masterPublicName: api.ipv6.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -41,6 +42,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
ipv6CIDR: /64#1
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/minimal-1.17/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.17.0
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -41,6 +42,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.18.0
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -41,6 +42,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.19.0
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -41,6 +42,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -41,6 +42,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/minimal-1.21/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -41,6 +42,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.22.0
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -41,6 +42,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.private.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -43,6 +44,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
egress: nat-09123456
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/overrides/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.overrides.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -44,6 +45,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/private/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.private.example.com
networkCIDR: 172.20.0.0/16
Expand All @@ -47,6 +48,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.private.example.com
networking:
Expand All @@ -46,6 +47,7 @@ spec:
project: testproject
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- name: us-test1
region: us-test1
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.private-subnets.example.com
networkCIDR: 10.0.0.0/12
Expand All @@ -44,6 +45,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 10.10.0.0/24
id: subnet-1
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.subnet.example.com
networkCIDR: 10.0.0.0/12
Expand All @@ -42,6 +43,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 10.10.0.0/24
id: subnet-1
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.subnet.example.com
networkCIDR: 10.0.0.0/12
Expand All @@ -42,6 +43,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 10.10.0.0/24
id: subnet-1
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ spec:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.21.0
masterPublicName: api.vpc.example.com
networkCIDR: 10.0.0.0/12
Expand All @@ -42,6 +43,7 @@ spec:
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 10.2.0.0/15
name: us-test-1a
Expand Down
Loading