From 1593aabee93bd1c3ac72e94ff0cb0d9722af41b8 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 17 Aug 2023 05:30:11 +0300 Subject: [PATCH] hack/update-expected.sh --- .../create_cluster/cilium-eni/expected-v1alpha2.yaml | 2 +- .../create_cluster/complex/expected-v1alpha2.yaml | 2 +- .../create_cluster/different-amis/expected-v1alpha2.yaml | 4 ++-- tests/integration/create_cluster/ha/expected-v1alpha2.yaml | 6 +++--- .../create_cluster/ha_encrypt/expected-v1alpha2.yaml | 6 +++--- .../create_cluster/ha_openstack/expected-v1alpha2.yaml | 2 +- .../ha_openstack_nodns/expected-v1alpha2.yaml | 4 ++-- .../ha_openstack_octavia/expected-v1alpha2.yaml | 4 ++-- .../create_cluster/ha_shared_zone/expected-v1alpha2.yaml | 2 +- .../create_cluster/ha_shared_zones/expected-v1alpha2.yaml | 4 ++-- .../create_cluster/ingwspecified/expected-v1alpha2.yaml | 4 ++-- .../integration/create_cluster/ipv6/expected-v1alpha2.yaml | 4 ++-- .../create_cluster/karpenter/expected-v1alpha2.yaml | 6 +++--- .../create_cluster/minimal-1.23/expected-v1alpha2.yaml | 2 +- .../create_cluster/minimal-1.24/expected-v1alpha2.yaml | 2 +- .../create_cluster/minimal-1.25/expected-v1alpha2.yaml | 2 +- .../minimal-1.26-arm64/expected-v1alpha2.yaml | 2 +- .../create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml | 2 +- .../create_cluster/minimal-1.26/expected-v1alpha2.yaml | 2 +- .../create_cluster/minimal-1.27/expected-v1alpha2.yaml | 2 +- .../minimal_feature-gates/expected-v1alpha2.yaml | 2 +- .../create_cluster/ngwspecified/expected-v1alpha2.yaml | 4 ++-- .../create_cluster/overrides/expected-v1alpha2.yaml | 2 +- .../create_cluster/private/expected-v1alpha2.yaml | 4 ++-- .../create_cluster/shared_vpc/expected-v1alpha2.yaml | 2 +- 25 files changed, 39 insertions(+), 39 deletions(-) diff --git a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml index b52a62b15d..ee424c8feb 100644 --- a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml @@ -52,7 +52,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml index 2cbfc06e29..c7d2f12065 100644 --- a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml @@ -47,7 +47,7 @@ spec: sshAccess: - 1.2.3.4/32 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml b/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml index de86f191d0..7db5dc022d 100644 --- a/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml @@ -50,11 +50,11 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Private zone: us-test-1a - - cidr: 172.20.0.0/22 + - cidr: 172.20.0.0/20 name: utility-us-test-1a type: Utility zone: us-test-1a diff --git a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml index f13828e0d4..65d16de983 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml @@ -60,15 +60,15 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.64.0/18 name: us-test-1a type: Public zone: us-test-1a - - cidr: 172.20.64.0/19 + - cidr: 172.20.128.0/18 name: us-test-1b type: Public zone: us-test-1b - - cidr: 172.20.96.0/19 + - cidr: 172.20.192.0/18 name: us-test-1c type: Public zone: us-test-1c diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml index 480dc07b67..3a02ecb2f6 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -60,15 +60,15 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.64.0/18 name: us-test-1a type: Public zone: us-test-1a - - cidr: 172.20.64.0/19 + - cidr: 172.20.128.0/18 name: us-test-1b type: Public zone: us-test-1b - - cidr: 172.20.96.0/19 + - cidr: 172.20.192.0/18 name: us-test-1c type: Public zone: us-test-1c diff --git a/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml index 394b7fbe06..eeafdf2fe8 100644 --- a/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml @@ -68,7 +68,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 10.0.32.0/19 + - cidr: 10.0.128.0/17 name: us-test1 type: Public zone: us-test1 diff --git a/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml index acd6e310e7..d77cb26fa7 100644 --- a/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml @@ -76,11 +76,11 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 10.0.32.0/19 + - cidr: 10.0.128.0/17 name: us-test1 type: Private zone: us-test1 - - cidr: 10.0.0.0/22 + - cidr: 10.0.0.0/20 name: utility-us-test1 type: Utility zone: us-test1 diff --git a/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml index e9401db3e4..0aefe03ea1 100644 --- a/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml @@ -74,11 +74,11 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 10.0.32.0/19 + - cidr: 10.0.128.0/17 name: us-test1 type: Private zone: us-test1 - - cidr: 10.0.0.0/22 + - cidr: 10.0.0.0/20 name: utility-us-test1 type: Utility zone: us-test1 diff --git a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml index 086964692b..f421bf9fcd 100644 --- a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml @@ -60,7 +60,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml index 8d875cd8e6..979ce25886 100644 --- a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml @@ -72,11 +72,11 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.64.0/18 name: us-test-1a type: Public zone: us-test-1a - - cidr: 172.20.64.0/19 + - cidr: 172.20.128.0/18 name: us-test-1b type: Public zone: us-test-1b diff --git a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml index f315e39804..ae24bb6773 100644 --- a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml @@ -50,12 +50,12 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 egress: i-09123456 name: us-test-1a type: Private zone: us-test-1a - - cidr: 172.20.0.0/22 + - cidr: 172.20.0.0/20 name: utility-us-test-1a type: Utility zone: us-test-1a diff --git a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml index e189746831..488fce2f4d 100644 --- a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml @@ -55,12 +55,12 @@ spec: name: us-test-1a type: Private zone: us-test-1a - - cidr: 172.20.32.0/19 + - cidr: 172.20.64.0/18 ipv6CIDR: /64#1 name: dualstack-us-test-1a type: DualStack zone: us-test-1a - - cidr: 172.20.0.0/22 + - cidr: 172.20.0.0/21 ipv6CIDR: /64#2 name: utility-us-test-1a type: Utility diff --git a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml index a7fabae850..157f8ccced 100644 --- a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml @@ -54,15 +54,15 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.64.0/18 name: us-test-1a type: Public zone: us-test-1a - - cidr: 172.20.64.0/19 + - cidr: 172.20.128.0/18 name: us-test-1b type: Public zone: us-test-1b - - cidr: 172.20.96.0/19 + - cidr: 172.20.192.0/18 name: us-test-1c type: Public zone: us-test-1c diff --git a/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml index b1e3a4d6de..60d18045b4 100644 --- a/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml @@ -48,7 +48,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml index d95b83b2d5..fa7f01554e 100644 --- a/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml @@ -48,7 +48,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml index 02354c50c9..10ad3e1818 100644 --- a/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml @@ -48,7 +48,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml index f10ed4eed7..f138d552dd 100644 --- a/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml @@ -48,7 +48,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml index e8ac40a74c..041d061f58 100644 --- a/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml @@ -52,7 +52,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml index 3010306191..a41b300872 100644 --- a/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml @@ -48,7 +48,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml index 6f0b4ddd15..d06b7a4612 100644 --- a/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml @@ -48,7 +48,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml index fac4e0cd40..c0776571a0 100644 --- a/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml @@ -72,7 +72,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml index 0f2d78c862..719932b889 100644 --- a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml @@ -50,12 +50,12 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 egress: nat-09123456 name: us-test-1a type: Private zone: us-test-1a - - cidr: 172.20.0.0/22 + - cidr: 172.20.0.0/20 name: utility-us-test-1a type: Utility zone: us-test-1a diff --git a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml index 317570bc62..290b75e6e9 100644 --- a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml @@ -51,7 +51,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Public zone: us-test-1a diff --git a/tests/integration/create_cluster/private/expected-v1alpha2.yaml b/tests/integration/create_cluster/private/expected-v1alpha2.yaml index 916bd2de2c..646cb1a1ec 100644 --- a/tests/integration/create_cluster/private/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private/expected-v1alpha2.yaml @@ -54,11 +54,11 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 172.20.32.0/19 + - cidr: 172.20.128.0/17 name: us-test-1a type: Private zone: us-test-1a - - cidr: 172.20.0.0/22 + - cidr: 172.20.0.0/20 name: utility-us-test-1a type: Utility zone: us-test-1a diff --git a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml index 91c7ca6f09..f05d25c66d 100644 --- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml @@ -49,7 +49,7 @@ spec: - 0.0.0.0/0 - ::/0 subnets: - - cidr: 10.2.0.0/15 + - cidr: 10.8.0.0/13 name: us-test-1a type: Public zone: us-test-1a