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

hack/update-expected.sh

This commit is contained in:
Ciprian Hacman 2025-01-04 14:39:11 +02:00
parent eaf796c3c0
commit 1f69da94b6
933 changed files with 3944 additions and 48362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml
View File

@ -42,7 +42,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cilium: cilium:
@ -71,9 +71,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -91,10 +89,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/cilium-eni/options.yaml
View File

@ -3,4 +3,4 @@ Zones:
- us-test-1a - us-test-1a
CloudProvider: aws CloudProvider: aws
Networking: cilium-eni Networking: cilium-eni
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0

34
tests/integration/create_cluster/complex-private/expected-v1alpha2.yaml
View File

@ -57,7 +57,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 10.0.0.0/16 networkCIDR: 10.0.0.0/16
networking: networking:
cni: {} cni: {}
@ -135,10 +135,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: bastions name: bastions
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.micro machineType: t2.micro
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -162,9 +159,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -182,9 +177,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1b name: control-plane-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -202,9 +195,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1c name: control-plane-us-test-1c
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -222,10 +213,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 4 maxSize: 4
minSize: 4 minSize: 4
@ -244,10 +232,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1b name: nodes-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 3 maxSize: 3
minSize: 3 minSize: 3
@ -265,10 +250,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1c name: nodes-us-test-1c
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 3 maxSize: 3
minSize: 3 minSize: 3

2
tests/integration/create_cluster/complex-private/options.yaml
View File

@ -15,7 +15,7 @@ Topology: private
Bastion: true Bastion: true
ControlPlaneCount: 3 ControlPlaneCount: 3
NodeCount: 10 NodeCount: 10
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0
# We specify SSHAccess but _not_ AdminAccess # We specify SSHAccess but _not_ AdminAccess
SSHAccess: SSHAccess:
- 1.2.3.4/32 - 1.2.3.4/32

29
tests/integration/create_cluster/complex/expected-v1alpha2.yaml
View File

@ -57,7 +57,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 10.0.0.0/16 networkCIDR: 10.0.0.0/16
networking: networking:
cni: {} cni: {}
@ -107,9 +107,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -127,9 +125,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1b name: control-plane-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -147,9 +143,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1c name: control-plane-us-test-1c
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -167,10 +161,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 4 maxSize: 4
minSize: 4 minSize: 4
@ -189,10 +180,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1b name: nodes-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 3 maxSize: 3
minSize: 3 minSize: 3
@ -210,10 +198,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1c name: nodes-us-test-1c
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 3 maxSize: 3
minSize: 3 minSize: 3

2
tests/integration/create_cluster/complex/options.yaml
View File

@ -13,7 +13,7 @@ NetworkCIDRs:
Networking: cni Networking: cni
ControlPlaneCount: 3 ControlPlaneCount: 3
NodeCount: 10 NodeCount: 10
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0
# We specify SSHAccess but _not_ AdminAccess # We specify SSHAccess but _not_ AdminAccess
SSHAccess: SSHAccess:
- 1.2.3.4/32 - 1.2.3.4/32

29
tests/integration/create_cluster/ha/expected-v1alpha2.yaml
View File

@ -52,7 +52,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -87,9 +87,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -107,9 +105,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1b name: control-plane-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -127,9 +123,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1c name: control-plane-us-test-1c
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -147,10 +141,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -168,10 +159,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1b name: nodes-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -189,10 +177,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1c name: nodes-us-test-1c
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/ha/options.yaml
View File

@ -9,4 +9,4 @@ ControlPlaneZones:
- us-test-1c - us-test-1c
CloudProvider: aws CloudProvider: aws
Networking: cni Networking: cni
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0

20
tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml
View File

@ -46,7 +46,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networking: networking:
cni: {} cni: {}
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
@ -73,7 +73,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: control-plane-us-test1-a name: control-plane-us-test1-a
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607 image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
machineType: e2-medium machineType: e2-medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -93,7 +93,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: control-plane-us-test1-b name: control-plane-us-test1-b
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607 image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
machineType: e2-medium machineType: e2-medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -113,7 +113,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: control-plane-us-test1-c name: control-plane-us-test1-c
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607 image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
machineType: e2-medium machineType: e2-medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -133,12 +133,10 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-a name: nodes-us-test1-a
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607 image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
machineType: e2-medium machineType: e2-medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
nodeLabels:
cloud.google.com/metadata-proxy-ready: "true"
role: Node role: Node
subnets: subnets:
- us-test1 - us-test1
@ -155,12 +153,10 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-b name: nodes-us-test1-b
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607 image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
machineType: e2-medium machineType: e2-medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
nodeLabels:
cloud.google.com/metadata-proxy-ready: "true"
role: Node role: Node
subnets: subnets:
- us-test1 - us-test1
@ -177,12 +173,10 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-c name: nodes-us-test1-c
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607 image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
machineType: e2-medium machineType: e2-medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
nodeLabels:
cloud.google.com/metadata-proxy-ready: "true"
role: Node role: Node
subnets: subnets:
- us-test1 - us-test1

2
tests/integration/create_cluster/ha_gce/options.yaml
View File

@ -4,7 +4,7 @@ ControlPlaneZones:
- us-test1-a - us-test1-a
- us-test1-b - us-test1-b
- us-test1-c - us-test1-c
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0
Networking: cni Networking: cni
Project: testproject Project: testproject
Zones: Zones:

10
tests/integration/create_cluster/ha_hetzner/expected-v1alpha2.yaml
View File

@ -45,7 +45,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.25.0 kubernetesVersion: v1.32.0
networkCIDR: 10.0.0.0/16 networkCIDR: 10.0.0.0/16
networking: networking:
cni: {} cni: {}
@ -71,7 +71,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-fsn1-1 name: control-plane-fsn1-1
spec: spec:
image: ubuntu-20.04 image: ubuntu-22.04
machineType: cx21 machineType: cx21
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -89,7 +89,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-fsn1-2 name: control-plane-fsn1-2
spec: spec:
image: ubuntu-20.04 image: ubuntu-22.04
machineType: cx21 machineType: cx21
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -107,7 +107,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-fsn1-3 name: control-plane-fsn1-3
spec: spec:
image: ubuntu-20.04 image: ubuntu-22.04
machineType: cx21 machineType: cx21
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -125,7 +125,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-fsn1 name: nodes-fsn1
spec: spec:
image: ubuntu-20.04 image: ubuntu-22.04
machineType: cx21 machineType: cx21
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/ha_hetzner/options.yaml
View File

@ -1,6 +1,6 @@
CloudProvider: hetzner CloudProvider: hetzner
ClusterName: ha.example.com ClusterName: ha.example.com
KubernetesVersion: v1.25.0 KubernetesVersion: v1.32.0
ControlPlaneCount: 3 ControlPlaneCount: 3
NetworkCIDRs: NetworkCIDRs:
- 10.0.0.0/16 - 10.0.0.0/16

2
tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml
View File

@ -59,7 +59,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.25.0 kubernetesVersion: v1.32.0
networkCIDR: 10.0.0.0/16 networkCIDR: 10.0.0.0/16
networking: networking:
cni: {} cni: {}

2
tests/integration/create_cluster/ha_openstack/options.yaml
View File

@ -1,7 +1,7 @@
CloudProvider: openstack CloudProvider: openstack
ClusterName: minimal.k8s.local ClusterName: minimal.k8s.local
Image: ubuntu-20.04 Image: ubuntu-20.04
KubernetesVersion: v1.25.0 KubernetesVersion: v1.32.0
ControlPlaneCount: 3 ControlPlaneCount: 3
NetworkCIDRs: NetworkCIDRs:
- 10.0.0.0/16 - 10.0.0.0/16

2
tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml
View File

@ -67,7 +67,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.25.0 kubernetesVersion: v1.32.0
networkCIDR: 10.0.0.0/16 networkCIDR: 10.0.0.0/16
networking: networking:
calico: {} calico: {}

2
tests/integration/create_cluster/ha_openstack_nodns/options.yaml
View File

@ -1,7 +1,7 @@
CloudProvider: openstack CloudProvider: openstack
ClusterName: ha.example.com ClusterName: ha.example.com
Image: ubuntu-20.04 Image: ubuntu-20.04
KubernetesVersion: v1.25.0 KubernetesVersion: v1.32.0
ControlPlaneCount: 3 ControlPlaneCount: 3
NetworkCIDRs: NetworkCIDRs:
- 10.0.0.0/16 - 10.0.0.0/16

2
tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml
View File

@ -65,7 +65,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.25.0 kubernetesVersion: v1.32.0
networkCIDR: 10.0.0.0/16 networkCIDR: 10.0.0.0/16
networking: networking:
cni: {} cni: {}

2
tests/integration/create_cluster/ha_openstack_octavia/options.yaml
View File

@ -1,7 +1,7 @@
CloudProvider: openstack CloudProvider: openstack
ClusterName: minimal.k8s.local ClusterName: minimal.k8s.local
Image: ubuntu-20.04 Image: ubuntu-20.04
KubernetesVersion: v1.25.0 KubernetesVersion: v1.32.0
ControlPlaneCount: 3 ControlPlaneCount: 3
NetworkCIDRs: NetworkCIDRs:
- 10.0.0.0/16 - 10.0.0.0/16

19
tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml
View File

@ -52,7 +52,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -79,9 +79,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a-1 name: control-plane-us-test-1a-1
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -99,9 +97,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a-2 name: control-plane-us-test-1a-2
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -119,9 +115,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a-3 name: control-plane-us-test-1a-3
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -139,10 +133,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/ha_shared_zone/options.yaml
View File

@ -4,4 +4,4 @@ Zones:
ControlPlaneCount: 3 ControlPlaneCount: 3
CloudProvider: aws CloudProvider: aws
Networking: cni Networking: cni
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0

32
tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml
View File

@ -64,7 +64,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -95,9 +95,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a-1 name: control-plane-us-test-1a-1
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -115,9 +113,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a-2 name: control-plane-us-test-1a-2
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -135,9 +131,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a-3 name: control-plane-us-test-1a-3
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -155,9 +149,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1b-1 name: control-plane-us-test-1b-1
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -175,9 +167,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1b-2 name: control-plane-us-test-1b-2
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -195,10 +185,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -216,10 +203,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1b name: nodes-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/ha_shared_zones/options.yaml
View File

@ -5,4 +5,4 @@ Zones:
ControlPlaneCount: 5 ControlPlaneCount: 5
CloudProvider: aws CloudProvider: aws
Networking: cni Networking: cni
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0

16
tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml
View File

@ -40,7 +40,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -72,10 +72,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: bastions name: bastions
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.micro machineType: t2.micro
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -93,9 +90,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -113,10 +108,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/ingwspecified/options.yaml
View File

@ -6,4 +6,4 @@ Networking: cni
Topology: private Topology: private
Bastion: true Bastion: true
Egress: i-09123456 Egress: i-09123456
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0

98
tests/integration/create_cluster/minimal-1.26-gce/expected-v1alpha2.yaml
View File

@ -1,98 +0,0 @@
apiVersion: kops.k8s.io/v1alpha2
kind: Cluster
metadata:
creationTimestamp: "2017-01-01T00:00:00Z"
name: minimal.example.com
spec:
api:
loadBalancer:
type: Public
authorization:
rbac: {}
channel: stable
cloudConfig: {}
cloudProvider: gce
configBase: memfs://tests/minimal.example.com
etcdClusters:
- cpuRequest: 200m
etcdMembers:
- instanceGroup: control-plane-us-test1-a
name: a
manager:
backupRetentionDays: 90
memoryRequest: 100Mi
name: main
- cpuRequest: 100m
etcdMembers:
- instanceGroup: control-plane-us-test1-a
name: a
manager:
backupRetentionDays: 90
memoryRequest: 100Mi
name: events
iam:
allowContainerRegistry: true
legacy: false
kubelet:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
- ::/0
kubernetesVersion: v1.26.0
networking:
cni: {}
nonMasqueradeCIDR: 100.64.0.0/10
project: testproject
sshAccess:
- 0.0.0.0/0
- ::/0
subnets:
- cidr: 10.0.16.0/20
name: us-test1
region: us-test1
type: Public
topology:
dns:
type: None
---
apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: "2017-01-01T00:00:00Z"
labels:
kops.k8s.io/cluster: minimal.example.com
name: control-plane-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607
machineType: e2-medium
maxSize: 1
minSize: 1
role: Master
subnets:
- us-test1
zones:
- us-test1-a
---
apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: "2017-01-01T00:00:00Z"
labels:
kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607
machineType: e2-medium
maxSize: 1
minSize: 1
nodeLabels:
cloud.google.com/metadata-proxy-ready: "true"
role: Node
subnets:
- us-test1
zones:
- us-test1-a

7
tests/integration/create_cluster/minimal-1.29-gce/options.yaml
View File

@ -1,7 +0,0 @@
CloudProvider: gce
ClusterName: minimal.example.com
KubernetesVersion: v1.29.0
Networking: cni
Project: testproject
Zones:
- us-test1-a

11
tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml → tests/integration/create_cluster/minimal-1.31/expected-v1alpha2.yaml
View File

@ -40,7 +40,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.25.0 kubernetesVersion: v1.31.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -67,9 +67,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -87,10 +85,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/minimal-1.25/options.yaml → tests/integration/create_cluster/minimal-1.31/options.yaml
View File

@ -3,4 +3,4 @@ Zones:
- us-test-1a - us-test-1a
CloudProvider: aws CloudProvider: aws
Networking: cni Networking: cni
KubernetesVersion: v1.25.0 KubernetesVersion: v1.31.0

11
tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml → tests/integration/create_cluster/minimal-1.32/expected-v1alpha2.yaml
View File

@ -40,7 +40,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -67,9 +67,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -87,10 +85,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/minimal-1.26/options.yaml → tests/integration/create_cluster/minimal-1.32/options.yaml
View File

@ -3,4 +3,4 @@ Zones:
- us-test-1a - us-test-1a
CloudProvider: aws CloudProvider: aws
Networking: cni Networking: cni
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0

11
tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml → tests/integration/create_cluster/minimal-arm64/expected-v1alpha2.yaml
View File

@ -40,7 +40,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -67,9 +67,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m6g.xlarge machineType: m6g.xlarge
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -87,10 +85,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: m6g.xlarge machineType: m6g.xlarge
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/minimal-1.26-arm64/options.yaml → tests/integration/create_cluster/minimal-arm64/options.yaml
View File

@ -3,7 +3,7 @@ Zones:
- us-test-1a - us-test-1a
CloudProvider: aws CloudProvider: aws
Networking: cni Networking: cni
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0
NodeSizes: NodeSizes:
- m6g.xlarge - m6g.xlarge
ControlPlaneSizes: ControlPlaneSizes:

2
tests/integration/create_cluster/minimal-1.29-gce/expected-v1alpha2.yaml → tests/integration/create_cluster/minimal-gce-dns-none/expected-v1alpha2.yaml
View File

@ -38,7 +38,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.29.0 kubernetesVersion: v1.32.0
networking: networking:
cni: {} cni: {}
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10

2
tests/integration/create_cluster/minimal-1.26-gce-dns-none/options.yaml → tests/integration/create_cluster/minimal-gce-dns-none/options.yaml
View File

@ -1,7 +1,7 @@
CloudProvider: gce CloudProvider: gce
ClusterName: minimal.example.com ClusterName: minimal.example.com
Networking: cni Networking: cni
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0
Project: testproject Project: testproject
Zones: Zones:
- us-test1-a - us-test1-a

8
tests/integration/create_cluster/minimal-1.26-gce-dns-none/expected-v1alpha2.yaml → tests/integration/create_cluster/minimal-gce/expected-v1alpha2.yaml
View File

@ -38,7 +38,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networking: networking:
cni: {} cni: {}
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
@ -65,7 +65,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: control-plane-us-test1-a name: control-plane-us-test1-a
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607 image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
machineType: e2-medium machineType: e2-medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -85,12 +85,10 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test1-a name: nodes-us-test1-a
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607 image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
machineType: e2-medium machineType: e2-medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
nodeLabels:
cloud.google.com/metadata-proxy-ready: "true"
role: Node role: Node
subnets: subnets:
- us-test1 - us-test1

2
tests/integration/create_cluster/minimal-1.26-gce/options.yaml → tests/integration/create_cluster/minimal-gce/options.yaml
View File

@ -1,6 +1,6 @@
CloudProvider: gce CloudProvider: gce
ClusterName: minimal.example.com ClusterName: minimal.example.com
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0
Networking: cni Networking: cni
Project: testproject Project: testproject
Zones: Zones:

11
tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml → tests/integration/create_cluster/minimal-irsa/expected-v1alpha2.yaml
View File

@ -41,7 +41,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -71,9 +71,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -91,10 +89,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/minimal-1.26-irsa/options.yaml → tests/integration/create_cluster/minimal-irsa/options.yaml
View File

@ -3,5 +3,5 @@ Zones:
- us-test-1a - us-test-1a
CloudProvider: aws CloudProvider: aws
Networking: cni Networking: cni
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0
DiscoveryStore: memfs://tests/minimal.example.com/discovery DiscoveryStore: memfs://tests/minimal.example.com/discovery

11
tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml
View File

@ -64,7 +64,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -91,9 +91,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -111,10 +109,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/minimal_feature-gates/options.yaml
View File

@ -3,7 +3,7 @@ Zones:
- us-test-1a - us-test-1a
CloudProvider: aws CloudProvider: aws
Networking: cni Networking: cni
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0
KubernetesFeatureGates: KubernetesFeatureGates:
- SELinuxMountReadWriteOncePod - SELinuxMountReadWriteOncePod
- +ReadWriteOncePod - +ReadWriteOncePod

6
tests/integration/create_cluster/minimal_hetzner/expected-v1alpha2.yaml
View File

@ -37,7 +37,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.25.0 kubernetesVersion: v1.32.0
networkCIDR: 10.0.0.0/16 networkCIDR: 10.0.0.0/16
networking: networking:
cni: {} cni: {}
@ -63,7 +63,7 @@ metadata:
kops.k8s.io/cluster: minimal.k8s.local kops.k8s.io/cluster: minimal.k8s.local
name: control-plane-fsn1 name: control-plane-fsn1
spec: spec:
image: ubuntu-20.04 image: ubuntu-22.04
machineType: cx21 machineType: cx21
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -81,7 +81,7 @@ metadata:
kops.k8s.io/cluster: minimal.k8s.local kops.k8s.io/cluster: minimal.k8s.local
name: nodes-fsn1 name: nodes-fsn1
spec: spec:
image: ubuntu-20.04 image: ubuntu-22.04
machineType: cx21 machineType: cx21
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/minimal_hetzner/options.yaml
View File

@ -1,6 +1,6 @@
CloudProvider: hetzner CloudProvider: hetzner
ClusterName: minimal.k8s.local ClusterName: minimal.k8s.local
KubernetesVersion: v1.25.0 KubernetesVersion: v1.32.0
NetworkCIDRs: NetworkCIDRs:
- 10.0.0.0/16 - 10.0.0.0/16
Networking: cni Networking: cni

16
tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml
View File

@ -40,7 +40,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -72,10 +72,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: bastions name: bastions
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.micro machineType: t2.micro
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -93,9 +90,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -113,10 +108,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/ngwspecified/options.yaml
View File

@ -6,4 +6,4 @@ Networking: cni
Topology: private Topology: private
Bastion: true Bastion: true
Egress: nat-09123456 Egress: nat-09123456
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0

11
tests/integration/create_cluster/overrides/expected-v1alpha2.yaml
View File

@ -40,7 +40,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -70,9 +70,7 @@ metadata:
kops.k8s.io/cluster: overrides.example.com kops.k8s.io/cluster: overrides.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -90,10 +88,7 @@ metadata:
kops.k8s.io/cluster: overrides.example.com kops.k8s.io/cluster: overrides.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/overrides/options.yaml
View File

@ -3,6 +3,6 @@ Zones:
- us-test-1a - us-test-1a
CloudProvider: aws CloudProvider: aws
Networking: cni Networking: cni
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0
Sets: Sets:
- cluster.spec.nodePortAccess=1.2.3.4/32,10.20.30.0/24 - cluster.spec.nodePortAccess=1.2.3.4/32,10.20.30.0/24

16
tests/integration/create_cluster/private/expected-v1alpha2.yaml
View File

@ -44,7 +44,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:
cni: {} cni: {}
@ -75,10 +75,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: bastions name: bastions
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.micro machineType: t2.micro
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -99,9 +96,7 @@ spec:
additionalSecurityGroups: additionalSecurityGroups:
- sg-exampleid3 - sg-exampleid3
- sg-exampleid4 - sg-exampleid4
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -122,10 +117,7 @@ spec:
additionalSecurityGroups: additionalSecurityGroups:
- sg-exampleid - sg-exampleid
- sg-exampleid2 - sg-exampleid2
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/private/options.yaml
View File

@ -11,5 +11,5 @@ NodeSecurityGroups:
ControlPlaneSecurityGroups: ControlPlaneSecurityGroups:
- sg-exampleid3 - sg-exampleid3
- sg-exampleid4 - sg-exampleid4
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0
cloudLabels: "Owner=John Doe,dn=\"cn=John Doe: dc=example dc=com\", foo/bar=fib+baz" cloudLabels: "Owner=John Doe,dn=\"cn=John Doe: dc=example dc=com\", foo/bar=fib+baz"

10
tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml
View File

@ -43,7 +43,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networking: networking:
cni: {} cni: {}
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
@ -70,7 +70,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: bastions name: bastions
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607 image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
machineType: e2-micro machineType: e2-micro
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -93,7 +93,7 @@ spec:
additionalSecurityGroups: additionalSecurityGroups:
- sg-exampleid3 - sg-exampleid3
- sg-exampleid4 - sg-exampleid4
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607 image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
machineType: e2-standard-2 machineType: e2-standard-2
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -116,12 +116,10 @@ spec:
additionalSecurityGroups: additionalSecurityGroups:
- sg-exampleid - sg-exampleid
- sg-exampleid2 - sg-exampleid2
image: ubuntu-os-cloud/ubuntu-2004-focal-v20240607 image: ubuntu-os-cloud/ubuntu-2204-jammy-v20240607
machineType: e2-medium machineType: e2-medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
nodeLabels:
cloud.google.com/metadata-proxy-ready: "true"
role: Node role: Node
subnets: subnets:
- us-test1 - us-test1

2
tests/integration/create_cluster/private_gce/options.yaml
View File

@ -11,7 +11,7 @@ NodeSecurityGroups:
ControlPlaneSecurityGroups: ControlPlaneSecurityGroups:
- sg-exampleid3 - sg-exampleid3
- sg-exampleid4 - sg-exampleid4
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0
cloudLabels: "Owner=John Doe,dn=\"cn=John Doe: dc=example dc=com\", foo/bar=fib+baz" cloudLabels: "Owner=John Doe,dn=\"cn=John Doe: dc=example dc=com\", foo/bar=fib+baz"
Project: testproject Project: testproject
GCEServiceAccount: test-account@testproject.iam.gserviceaccount.com GCEServiceAccount: test-account@testproject.iam.gserviceaccount.com

11
tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml
View File

@ -40,7 +40,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 10.0.0.0/12 networkCIDR: 10.0.0.0/12
networkID: vpc-12345678 networkID: vpc-12345678
networking: networking:
@ -74,9 +74,7 @@ metadata:
kops.k8s.io/cluster: private-subnets.example.com kops.k8s.io/cluster: private-subnets.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -94,10 +92,7 @@ metadata:
kops.k8s.io/cluster: private-subnets.example.com kops.k8s.io/cluster: private-subnets.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/private_shared_subnets/options.yaml
View File

@ -9,4 +9,4 @@ SubnetIDs:
- subnet-1 - subnet-1
UtilitySubnetIDs: UtilitySubnetIDs:
- subnet-2 - subnet-2
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0

11
tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml
View File

@ -40,7 +40,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 10.0.0.0/12 networkCIDR: 10.0.0.0/12
networkID: vpc-12345678 networkID: vpc-12345678
networking: networking:
@ -69,9 +69,7 @@ metadata:
kops.k8s.io/cluster: subnet.example.com kops.k8s.io/cluster: subnet.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -89,10 +87,7 @@ metadata:
kops.k8s.io/cluster: subnet.example.com kops.k8s.io/cluster: subnet.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/shared_subnets/options.yaml
View File

@ -6,4 +6,4 @@ Networking: cni
NetworkID: vpc-12345678 NetworkID: vpc-12345678
SubnetIDs: SubnetIDs:
- subnet-1 - subnet-1
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0

11
tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml
View File

@ -40,7 +40,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 10.0.0.0/12 networkCIDR: 10.0.0.0/12
networkID: vpc-12345678 networkID: vpc-12345678
networking: networking:
@ -69,9 +69,7 @@ metadata:
kops.k8s.io/cluster: subnet.example.com kops.k8s.io/cluster: subnet.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -89,10 +87,7 @@ metadata:
kops.k8s.io/cluster: subnet.example.com kops.k8s.io/cluster: subnet.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/shared_subnets_vpc_lookup/options.yaml
View File

@ -5,4 +5,4 @@ CloudProvider: aws
Networking: cni Networking: cni
SubnetIDs: SubnetIDs:
- subnet-1 - subnet-1
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0

11
tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml
View File

@ -40,7 +40,7 @@ spec:
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
- ::/0 - ::/0
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
networkCIDR: 10.0.0.0/12 networkCIDR: 10.0.0.0/12
networkID: vpc-12345678 networkID: vpc-12345678
networking: networking:
@ -68,9 +68,7 @@ metadata:
kops.k8s.io/cluster: vpc.example.com kops.k8s.io/cluster: vpc.example.com
name: control-plane-us-test-1a name: control-plane-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpTokens: required
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -88,10 +86,7 @@ metadata:
kops.k8s.io/cluster: vpc.example.com kops.k8s.io/cluster: vpc.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20241112 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20241211
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

2
tests/integration/create_cluster/shared_vpc/options.yaml
View File

@ -4,4 +4,4 @@ Zones:
CloudProvider: aws CloudProvider: aws
Networking: cni Networking: cni
NetworkID: vpc-12345678 NetworkID: vpc-12345678
KubernetesVersion: v1.26.0 KubernetesVersion: v1.32.0

2
tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content
View File

@ -6,7 +6,7 @@ spec:
addons: addons:
- id: k8s-1.16 - id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 47a89521a20f66f307f308c2e0132647e4bbbac39e5d06bfa34cf965158a20aa manifestHash: 09d2410e4611ace55db925f141becb316a6fe389651bcaab44f411682d5e8195
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane needsRollingUpdate: control-plane
selector: selector:

2
tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
View File

@ -63,6 +63,8 @@ spec:
env: env:
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1 value: 127.0.0.1
- name: KOPS_RUN_TOO_NEW_VERSION
value: "1"
image: registry.k8s.io/kops/kops-controller:1.31.0-beta.1 image: registry.k8s.io/kops/kops-controller:1.31.0-beta.1
name: kops-controller name: kops-controller
resources: resources:

2
tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -6,7 +6,7 @@ spec:
addons: addons:
- id: k8s-1.16 - id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: e4f26aac0617f5d44e6804859641bc0f132e5e06a719d920aac606b675ee42e6 manifestHash: b62375cdbb115294bd688408cd8d863ada8d8d6790cb3c48fc83ab3bcba8bfae
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane needsRollingUpdate: control-plane
selector: selector:

2
tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
View File

@ -63,6 +63,8 @@ spec:
env: env:
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1 value: 127.0.0.1
- name: KOPS_RUN_TOO_NEW_VERSION
value: "1"
image: registry.k8s.io/kops/kops-controller:1.31.0-beta.1 image: registry.k8s.io/kops/kops-controller:1.31.0-beta.1
name: kops-controller name: kops-controller
resources: resources:

2
tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -130,7 +130,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: 7eHYq2LK1E2ckFYz8iTZKhMiwyKE9zZ4N9Iijh0av/c= NodeupConfigHash: W8NFX6KK30qwqKrWITT68BWrONeCqODCE+WyT5XaCtg=
__EOF_KUBE_ENV __EOF_KUBE_ENV

2
tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.minimal.example.com:3988/ - https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: 8CZ7yLVzS//HUyyG0tIMtQkPj8eMl/QL1MNtZRcEDDE= NodeupConfigHash: t2/12y7VXoGGNdtQIULeLhZDujjPhBAKUrRZmAAlMKU=
__EOF_KUBE_ENV __EOF_KUBE_ENV

31
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content
View File

@ -22,7 +22,7 @@ spec:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com clusterName: minimal.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.12 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
cloudProvider: aws cloudProvider: aws
@ -31,8 +31,8 @@ spec:
containerd: containerd:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
dnsZone: Z1AFAKE1ZON3YO dnsZone: Z1AFAKE1ZON3YO
etcdClusters: etcdClusters:
- backups: - backups:
@ -82,10 +82,7 @@ spec:
- https://127.0.0.1:4001 - https://127.0.0.1:4001
etcdServersOverrides: etcdServersOverrides:
- /events#https://127.0.0.1:4002 - /events#https://127.0.0.1:4002
featureGates: image: registry.k8s.io/kube-apiserver:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-apiserver:v1.26.0
kubeletPreferredAddressTypes: kubeletPreferredAddressTypes:
- InternalIP - InternalIP
- Hostname - Hostname
@ -111,10 +108,7 @@ spec:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com clusterName: minimal.example.com
configureCloudRoutes: false configureCloudRoutes: false
featureGates: image: registry.k8s.io/kube-controller-manager:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-controller-manager:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
@ -136,13 +130,10 @@ spec:
kubeProxy: kubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: image: registry.k8s.io/kube-scheduler:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-scheduler:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
@ -155,9 +146,6 @@ spec:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
podInfraContainerImage: registry.k8s.io/pause:3.9 podInfraContainerImage: registry.k8s.io/pause:3.9
@ -168,7 +156,7 @@ spec:
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
kubernetesVersion: 1.26.0 kubernetesVersion: 1.32.0
masterKubelet: masterKubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -178,9 +166,6 @@ spec:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
podInfraContainerImage: registry.k8s.io/pause:3.9 podInfraContainerImage: registry.k8s.io/pause:3.9

2
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content
View File

@ -48,7 +48,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE - name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token value: /var/run/secrets/amazonaws.com/token
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.12 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:

4
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -6,7 +6,7 @@ spec:
addons: addons:
- id: k8s-1.16 - id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: d1f0f8dd525c00141e16a7716fe1b4380b53e1f028dc4fcf6eeed91e8b95f022 manifestHash: 228514f5c6e5c8182c33ed224f1529ccdaf9d212cf5531007436c95ae9b421a7
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane needsRollingUpdate: control-plane
selector: selector:
@ -163,7 +163,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.18 - id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 156782e82a0be1accfe863bf7f7552f7deb1982820356c5f6cbc8947cc34d530 manifestHash: 4a3f87c3d96f6fd9fc43032c2b6f52135fabc91bec8e421df4b59e81325b0e68
name: aws-cloud-controller.addons.k8s.io name: aws-cloud-controller.addons.k8s.io
selector: selector:
k8s-addon: aws-cloud-controller.addons.k8s.io k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
View File

@ -63,6 +63,8 @@ spec:
env: env:
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1 value: 127.0.0.1
- name: KOPS_RUN_TOO_NEW_VERSION
value: "1"
image: registry.k8s.io/kops/kops-controller:1.31.0-beta.1 image: registry.k8s.io/kops/kops-controller:1.31.0-beta.1
name: kops-controller name: kops-controller
resources: resources:

48
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -26,10 +26,7 @@ APIServerConfig:
- https://127.0.0.1:4001 - https://127.0.0.1:4001
etcdServersOverrides: etcdServersOverrides:
- /events#https://127.0.0.1:4002 - /events#https://127.0.0.1:4002
featureGates: image: registry.k8s.io/kube-apiserver:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-apiserver:v1.26.0
kubeletPreferredAddressTypes: kubeletPreferredAddressTypes:
- InternalIP - InternalIP
- Hostname - Hostname
@ -59,21 +56,23 @@ APIServerConfig:
-----END RSA PUBLIC KEY----- -----END RSA PUBLIC KEY-----
Assets: Assets:
amd64: amd64:
- b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet - 5ad4965598773d56a37a8e8429c3dc3d86b4c5c26d8417ab333ae345c053dae2@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet
- b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz
- f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - f8b2d935d1f86003f4e0c1af3b9f0d2820bacabe6dc9f562785b74af24c5e468@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-amd64.tar.gz
- a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.amd64
- 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz
- d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz
- f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
- 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
arm64: arm64:
- fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet - bda9b2324c96693b38c41ecea051bab4c7c434be5683050b5e19025b50dbc0bf@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet
- 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ba4004f98f3d3a7b7d2954ff0a424caa2c2b06b78c17b1dccf2acc76a311a896@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz
- 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 - 48d0a8461ae829b12b07c3663b14b70287d0607a0792719c51b4e4dd700b02ce@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-arm64.tar.gz
- 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.arm64
- d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz - d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz
- 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz - 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz
- 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64
@ -239,19 +238,13 @@ ControlPlaneConfig:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com clusterName: minimal.example.com
configureCloudRoutes: false configureCloudRoutes: false
featureGates: image: registry.k8s.io/kube-controller-manager:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-controller-manager:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
KubeScheduler: KubeScheduler:
featureGates: image: registry.k8s.io/kube-scheduler:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-scheduler:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
@ -282,7 +275,7 @@ KeypairIDs:
KubeProxy: KubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
@ -293,9 +286,6 @@ KubeletConfig:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
nodeLabels: nodeLabels:
@ -310,7 +300,7 @@ KubeletConfig:
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
taints: taints:
- node-role.kubernetes.io/control-plane=:NoSchedule - node-role.kubernetes.io/control-plane=:NoSchedule
KubernetesVersion: 1.26.0 KubernetesVersion: 1.32.0
Networking: Networking:
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
@ -323,8 +313,8 @@ configStore:
containerdConfig: containerdConfig:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
etcdManifests: etcdManifests:
- memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
- memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml

33
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -1,18 +1,20 @@
Assets: Assets:
amd64: amd64:
- b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet - 5ad4965598773d56a37a8e8429c3dc3d86b4c5c26d8417ab333ae345c053dae2@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet
- b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz
- f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - f8b2d935d1f86003f4e0c1af3b9f0d2820bacabe6dc9f562785b74af24c5e468@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-amd64.tar.gz
- a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.amd64
- 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz
- d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz
arm64: arm64:
- fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet - bda9b2324c96693b38c41ecea051bab4c7c434be5683050b5e19025b50dbc0bf@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet
- 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ba4004f98f3d3a7b7d2954ff0a424caa2c2b06b78c17b1dccf2acc76a311a896@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz
- 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 - 48d0a8461ae829b12b07c3663b14b70287d0607a0792719c51b4e4dd700b02ce@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-arm64.tar.gz
- 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.arm64
- d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz - d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz
- 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz - 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz
CAs: {} CAs: {}
@ -26,7 +28,7 @@ KeypairIDs:
KubeProxy: KubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
@ -37,9 +39,6 @@ KubeletConfig:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
nodeLabels: nodeLabels:
@ -50,7 +49,7 @@ KubeletConfig:
registerSchedulable: true registerSchedulable: true
shutdownGracePeriod: 30s shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
KubernetesVersion: 1.26.0 KubernetesVersion: 1.32.0
Networking: Networking:
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
@ -58,7 +57,7 @@ UpdatePolicy: automatic
containerdConfig: containerdConfig:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
usesLegacyGossip: false usesLegacyGossip: false
usesNoneDNS: false usesNoneDNS: false

2
tests/integration/update_cluster/aws-lb-controller/in-v1alpha2.yaml
View File

@ -26,7 +26,7 @@ spec:
useServiceAccountExternalPermissions: true useServiceAccountExternalPermissions: true
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
masterPublicName: api.minimal.example.com masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16
networking: networking:

4
tests/integration/update_cluster/aws-lb-controller/kubernetes.tf
View File

@ -581,7 +581,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" {
http_endpoint = "enabled" http_endpoint = "enabled"
http_protocol_ipv6 = "disabled" http_protocol_ipv6 = "disabled"
http_put_response_hop_limit = 1 http_put_response_hop_limit = 1
http_tokens = "optional" http_tokens = "required"
} }
monitoring { monitoring {
enabled = false enabled = false
@ -663,7 +663,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" {
http_endpoint = "enabled" http_endpoint = "enabled"
http_protocol_ipv6 = "disabled" http_protocol_ipv6 = "disabled"
http_put_response_hop_limit = 1 http_put_response_hop_limit = 1
http_tokens = "optional" http_tokens = "required"
} }
monitoring { monitoring {
enabled = false enabled = false

2
tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
View File

@ -130,7 +130,7 @@ ClusterName: bastionuserdata.example.com
ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: cFGsAAqYrwM7b8sg8ARyUvrQ/X1mCS1wq1IuxNHlcbE= NodeupConfigHash: rL99cT4OyYW0C0ynhksxGSyeoJW7y7woK5oVKp7ByUU=
__EOF_KUBE_ENV __EOF_KUBE_ENV

2
tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
View File

@ -162,7 +162,7 @@ ConfigServer:
- https://kops-controller.internal.bastionuserdata.example.com:3988/ - https://kops-controller.internal.bastionuserdata.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: GBq6HoXAbWL91+sbYN2UBHutnOTPqZ4YF4eubbNjGsk= NodeupConfigHash: emMDqx0i80CCXdQsMgdrlX2q3VseHfmCIMw4+mYQM+g=
__EOF_KUBE_ENV __EOF_KUBE_ENV

2
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content
View File

@ -44,7 +44,7 @@ spec:
env: env:
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1 value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.12 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:

4
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content
View File

@ -6,7 +6,7 @@ spec:
addons: addons:
- id: k8s-1.16 - id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 294552bb6222305240b7ab21f19f93ddf4e8e57bd6c14b768f16670a9ec0430c manifestHash: 1694d90ed4cf5dfb3ddc064cb0389773c16bde0b5c429bb530fab95dbc619489
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane needsRollingUpdate: control-plane
selector: selector:
@ -99,7 +99,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.18 - id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 45a4e4473c930b3efea5de43e999d1c35ae45a0ea1d8eec58362564b40d1e25a manifestHash: 1f045fe2bedb93e9a2d836affe5955914ee3972ba7985622644460525e843001
name: aws-cloud-controller.addons.k8s.io name: aws-cloud-controller.addons.k8s.io
selector: selector:
k8s-addon: aws-cloud-controller.addons.k8s.io k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
View File

@ -63,6 +63,8 @@ spec:
env: env:
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1 value: 127.0.0.1
- name: KOPS_RUN_TOO_NEW_VERSION
value: "1"
image: registry.k8s.io/kops/kops-controller:1.31.0-beta.1 image: registry.k8s.io/kops/kops-controller:1.31.0-beta.1
name: kops-controller name: kops-controller
resources: resources:

31
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content
View File

@ -20,7 +20,7 @@ spec:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
clusterName: bastionuserdata.example.com clusterName: bastionuserdata.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.12 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
cloudProvider: aws cloudProvider: aws
@ -29,8 +29,8 @@ spec:
containerd: containerd:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
dnsZone: Z1AFAKE1ZON3YO dnsZone: Z1AFAKE1ZON3YO
etcdClusters: etcdClusters:
- backups: - backups:
@ -79,10 +79,7 @@ spec:
- https://127.0.0.1:4001 - https://127.0.0.1:4001
etcdServersOverrides: etcdServersOverrides:
- /events#https://127.0.0.1:4002 - /events#https://127.0.0.1:4002
featureGates: image: registry.k8s.io/kube-apiserver:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-apiserver:v1.26.0
kubeletPreferredAddressTypes: kubeletPreferredAddressTypes:
- InternalIP - InternalIP
- Hostname - Hostname
@ -108,10 +105,7 @@ spec:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
clusterName: bastionuserdata.example.com clusterName: bastionuserdata.example.com
configureCloudRoutes: false configureCloudRoutes: false
featureGates: image: registry.k8s.io/kube-controller-manager:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-controller-manager:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
@ -133,13 +127,10 @@ spec:
kubeProxy: kubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: image: registry.k8s.io/kube-scheduler:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-scheduler:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
@ -152,9 +143,6 @@ spec:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
podInfraContainerImage: registry.k8s.io/pause:3.9 podInfraContainerImage: registry.k8s.io/pause:3.9
@ -165,7 +153,7 @@ spec:
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
kubernetesVersion: 1.26.0 kubernetesVersion: 1.32.0
masterKubelet: masterKubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -175,9 +163,6 @@ spec:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
podInfraContainerImage: registry.k8s.io/pause:3.9 podInfraContainerImage: registry.k8s.io/pause:3.9

33
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content
View File

@ -1,18 +1,20 @@
Assets: Assets:
amd64: amd64:
- b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet - 5ad4965598773d56a37a8e8429c3dc3d86b4c5c26d8417ab333ae345c053dae2@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet
- b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz
- f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - f8b2d935d1f86003f4e0c1af3b9f0d2820bacabe6dc9f562785b74af24c5e468@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-amd64.tar.gz
- a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.amd64
- 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz
- d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz
arm64: arm64:
- fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet - bda9b2324c96693b38c41ecea051bab4c7c434be5683050b5e19025b50dbc0bf@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet
- 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ba4004f98f3d3a7b7d2954ff0a424caa2c2b06b78c17b1dccf2acc76a311a896@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz
- 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 - 48d0a8461ae829b12b07c3663b14b70287d0607a0792719c51b4e4dd700b02ce@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-arm64.tar.gz
- 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.arm64
- d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz - d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz
- 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz - 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz
CAs: {} CAs: {}
@ -25,7 +27,7 @@ KeypairIDs: {}
KubeProxy: KubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
@ -36,9 +38,6 @@ KubeletConfig:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
podInfraContainerImage: registry.k8s.io/pause:3.9 podInfraContainerImage: registry.k8s.io/pause:3.9
@ -47,7 +46,7 @@ KubeletConfig:
registerSchedulable: true registerSchedulable: true
shutdownGracePeriod: 30s shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
KubernetesVersion: 1.26.0 KubernetesVersion: 1.32.0
Networking: Networking:
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
@ -55,7 +54,7 @@ UpdatePolicy: automatic
containerdConfig: containerdConfig:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
usesLegacyGossip: false usesLegacyGossip: false
usesNoneDNS: false usesNoneDNS: false

48
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -25,10 +25,7 @@ APIServerConfig:
- https://127.0.0.1:4001 - https://127.0.0.1:4001
etcdServersOverrides: etcdServersOverrides:
- /events#https://127.0.0.1:4002 - /events#https://127.0.0.1:4002
featureGates: image: registry.k8s.io/kube-apiserver:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-apiserver:v1.26.0
kubeletPreferredAddressTypes: kubeletPreferredAddressTypes:
- InternalIP - InternalIP
- Hostname - Hostname
@ -58,21 +55,23 @@ APIServerConfig:
-----END RSA PUBLIC KEY----- -----END RSA PUBLIC KEY-----
Assets: Assets:
amd64: amd64:
- b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet - 5ad4965598773d56a37a8e8429c3dc3d86b4c5c26d8417ab333ae345c053dae2@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet
- b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz
- f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - f8b2d935d1f86003f4e0c1af3b9f0d2820bacabe6dc9f562785b74af24c5e468@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-amd64.tar.gz
- a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.amd64
- 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz
- d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz
- f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
- 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
arm64: arm64:
- fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet - bda9b2324c96693b38c41ecea051bab4c7c434be5683050b5e19025b50dbc0bf@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet
- 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ba4004f98f3d3a7b7d2954ff0a424caa2c2b06b78c17b1dccf2acc76a311a896@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz
- 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 - 48d0a8461ae829b12b07c3663b14b70287d0607a0792719c51b4e4dd700b02ce@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-arm64.tar.gz
- 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.arm64
- d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz - d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz
- 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz - 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz
- 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64
@ -238,19 +237,13 @@ ControlPlaneConfig:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
clusterName: bastionuserdata.example.com clusterName: bastionuserdata.example.com
configureCloudRoutes: false configureCloudRoutes: false
featureGates: image: registry.k8s.io/kube-controller-manager:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-controller-manager:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
KubeScheduler: KubeScheduler:
featureGates: image: registry.k8s.io/kube-scheduler:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-scheduler:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
@ -281,7 +274,7 @@ KeypairIDs:
KubeProxy: KubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
@ -292,9 +285,6 @@ KubeletConfig:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
nodeLabels: nodeLabels:
@ -309,7 +299,7 @@ KubeletConfig:
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
taints: taints:
- node-role.kubernetes.io/control-plane=:NoSchedule - node-role.kubernetes.io/control-plane=:NoSchedule
KubernetesVersion: 1.26.0 KubernetesVersion: 1.32.0
Networking: Networking:
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
@ -322,8 +312,8 @@ configStore:
containerdConfig: containerdConfig:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
etcdManifests: etcdManifests:
- memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/main-master-us-test-1a.yaml - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/main-master-us-test-1a.yaml
- memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/events-master-us-test-1a.yaml - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/events-master-us-test-1a.yaml

33
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -1,18 +1,20 @@
Assets: Assets:
amd64: amd64:
- b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet - 5ad4965598773d56a37a8e8429c3dc3d86b4c5c26d8417ab333ae345c053dae2@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet
- b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz
- f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - f8b2d935d1f86003f4e0c1af3b9f0d2820bacabe6dc9f562785b74af24c5e468@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-amd64.tar.gz
- a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.amd64
- 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz
- d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz
arm64: arm64:
- fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet - bda9b2324c96693b38c41ecea051bab4c7c434be5683050b5e19025b50dbc0bf@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet
- 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ba4004f98f3d3a7b7d2954ff0a424caa2c2b06b78c17b1dccf2acc76a311a896@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz
- 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 - 48d0a8461ae829b12b07c3663b14b70287d0607a0792719c51b4e4dd700b02ce@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-arm64.tar.gz
- 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.arm64
- d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz - d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz
- 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz - 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz
CAs: {} CAs: {}
@ -26,7 +28,7 @@ KeypairIDs:
KubeProxy: KubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
@ -37,9 +39,6 @@ KubeletConfig:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
nodeLabels: nodeLabels:
@ -50,7 +49,7 @@ KubeletConfig:
registerSchedulable: true registerSchedulable: true
shutdownGracePeriod: 30s shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
KubernetesVersion: 1.26.0 KubernetesVersion: 1.32.0
Networking: Networking:
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
@ -58,7 +57,7 @@ UpdatePolicy: automatic
containerdConfig: containerdConfig:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
usesLegacyGossip: false usesLegacyGossip: false
usesNoneDNS: false usesNoneDNS: false

2
tests/integration/update_cluster/bastionadditional_user-data/in-v1alpha2.yaml
View File

@ -21,7 +21,7 @@ spec:
iam: {} iam: {}
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
masterInternalName: api.internal.bastionuserdata.example.com masterInternalName: api.internal.bastionuserdata.example.com
masterPublicName: api.bastionuserdata.example.com masterPublicName: api.bastionuserdata.example.com
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16

6
tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View File

@ -564,7 +564,7 @@ resource "aws_launch_template" "bastion-bastionuserdata-example-com" {
http_endpoint = "enabled" http_endpoint = "enabled"
http_protocol_ipv6 = "disabled" http_protocol_ipv6 = "disabled"
http_put_response_hop_limit = 1 http_put_response_hop_limit = 1
http_tokens = "optional" http_tokens = "required"
} }
monitoring { monitoring {
enabled = false enabled = false
@ -638,7 +638,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-bastionuserdata-exampl
http_endpoint = "enabled" http_endpoint = "enabled"
http_protocol_ipv6 = "disabled" http_protocol_ipv6 = "disabled"
http_put_response_hop_limit = 1 http_put_response_hop_limit = 1
http_tokens = "optional" http_tokens = "required"
} }
monitoring { monitoring {
enabled = false enabled = false
@ -720,7 +720,7 @@ resource "aws_launch_template" "nodes-bastionuserdata-example-com" {
http_endpoint = "enabled" http_endpoint = "enabled"
http_protocol_ipv6 = "disabled" http_protocol_ipv6 = "disabled"
http_put_response_hop_limit = 1 http_put_response_hop_limit = 1
http_tokens = "optional" http_tokens = "required"
} }
monitoring { monitoring {
enabled = false enabled = false

2
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data
View File

@ -130,7 +130,7 @@ ClusterName: cas-priority-expander-custom.example.com
ConfigBase: memfs://clusters.example.com/cas-priority-expander-custom.example.com ConfigBase: memfs://clusters.example.com/cas-priority-expander-custom.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: b2xNUpnVA9+OHxycc5ZxoOaYX0WauMvhVCZbOHYhWSg= NodeupConfigHash: pSDEbIsX2TutbPcJW+i3FfhHJYzRyigYMcLePHMB7sg=
__EOF_KUBE_ENV __EOF_KUBE_ENV

2
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data
View File

@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
InstanceGroupName: nodes-high-priority InstanceGroupName: nodes-high-priority
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: 3S0kO0rn8/IeZUrZftL7DVYj+3R6xDMIb4Ntoz8LYwI= NodeupConfigHash: XmGPgFRA+OhH2coAsnrakNhDx6usiD6V41C5u9SY060=
__EOF_KUBE_ENV __EOF_KUBE_ENV

2
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data
View File

@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
InstanceGroupName: nodes-low-priority InstanceGroupName: nodes-low-priority
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: 3S0kO0rn8/IeZUrZftL7DVYj+3R6xDMIb4Ntoz8LYwI= NodeupConfigHash: XmGPgFRA+OhH2coAsnrakNhDx6usiD6V41C5u9SY060=
__EOF_KUBE_ENV __EOF_KUBE_ENV

2
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data
View File

@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: 3S0kO0rn8/IeZUrZftL7DVYj+3R6xDMIb4Ntoz8LYwI= NodeupConfigHash: XmGPgFRA+OhH2coAsnrakNhDx6usiD6V41C5u9SY060=
__EOF_KUBE_ENV __EOF_KUBE_ENV

2
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content
View File

@ -44,7 +44,7 @@ spec:
env: env:
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1 value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.12 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:

6
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content
View File

@ -6,7 +6,7 @@ spec:
addons: addons:
- id: k8s-1.16 - id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 63a30d15901dec0b8d6a53372c2065ca80532558d74b770441416255057fe738 manifestHash: a51d1c3ddc4aec4749104b032300e9c0ff96ddb4c2f6342d6ae0cea253d7c80b
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane needsRollingUpdate: control-plane
selector: selector:
@ -41,7 +41,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.15 - id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: e4817b8481df3f556c19999b552e60c6305ce8063481c6ec5d987f225aa686ad manifestHash: a3dabf22247ebe9511c5714760fffbe206397f265fe710caa73b6162678f3f68
name: cluster-autoscaler.addons.k8s.io name: cluster-autoscaler.addons.k8s.io
selector: selector:
k8s-addon: cluster-autoscaler.addons.k8s.io k8s-addon: cluster-autoscaler.addons.k8s.io
@ -106,7 +106,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.18 - id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: d77743ada468524073fc615bbe04f0175d1fb8648b46a012c78ec68340919868 manifestHash: 27c567b9d768681e944e8ee35915ee796d6bfdb6b6a40b83defafc236b3dc543
name: aws-cloud-controller.addons.k8s.io name: aws-cloud-controller.addons.k8s.io
selector: selector:
k8s-addon: aws-cloud-controller.addons.k8s.io k8s-addon: aws-cloud-controller.addons.k8s.io

3
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content
View File

@ -359,6 +359,7 @@ spec:
- --nodes=2:2:nodes-low-priority.cas-priority-expander-custom.example.com - --nodes=2:2:nodes-low-priority.cas-priority-expander-custom.example.com
- --ignore-daemonsets-utilization=false - --ignore-daemonsets-utilization=false
- --scale-down-utilization-threshold=0.5 - --scale-down-utilization-threshold=0.5
- --skip-nodes-with-custom-controller-pods=true
- --skip-nodes-with-local-storage=true - --skip-nodes-with-local-storage=true
- --skip-nodes-with-system-pods=true - --skip-nodes-with-system-pods=true
- --scale-down-delay-after-add=10m0s - --scale-down-delay-after-add=10m0s
@ -373,7 +374,7 @@ spec:
env: env:
- name: AWS_REGION - name: AWS_REGION
value: us-test-1 value: us-test-1
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.8 image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
failureThreshold: 3 failureThreshold: 3

2
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
View File

@ -63,6 +63,8 @@ spec:
env: env:
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1 value: 127.0.0.1
- name: KOPS_RUN_TOO_NEW_VERSION
value: "1"
image: registry.k8s.io/kops/kops-controller:1.31.0-beta.1 image: registry.k8s.io/kops/kops-controller:1.31.0-beta.1
name: kops-controller name: kops-controller
resources: resources:

33
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content
View File

@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
clusterName: cas-priority-expander-custom.example.com clusterName: cas-priority-expander-custom.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.12 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
cloudProvider: aws cloudProvider: aws
@ -38,7 +38,7 @@ spec:
enabled: true enabled: true
expander: priority expander: priority
ignoreDaemonSetsUtilization: false ignoreDaemonSetsUtilization: false
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.8 image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
maxNodeProvisionTime: 15m0s maxNodeProvisionTime: 15m0s
newPodScaleUpDelay: 0s newPodScaleUpDelay: 0s
scaleDownDelayAfterAdd: 10m0s scaleDownDelayAfterAdd: 10m0s
@ -53,8 +53,8 @@ spec:
containerd: containerd:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
dnsZone: Z1AFAKE1ZON3YO dnsZone: Z1AFAKE1ZON3YO
etcdClusters: etcdClusters:
- backups: - backups:
@ -101,10 +101,7 @@ spec:
- https://127.0.0.1:4001 - https://127.0.0.1:4001
etcdServersOverrides: etcdServersOverrides:
- /events#https://127.0.0.1:4002 - /events#https://127.0.0.1:4002
featureGates: image: registry.k8s.io/kube-apiserver:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-apiserver:v1.26.0
kubeletPreferredAddressTypes: kubeletPreferredAddressTypes:
- InternalIP - InternalIP
- Hostname - Hostname
@ -130,10 +127,7 @@ spec:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
clusterName: cas-priority-expander-custom.example.com clusterName: cas-priority-expander-custom.example.com
configureCloudRoutes: false configureCloudRoutes: false
featureGates: image: registry.k8s.io/kube-controller-manager:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-controller-manager:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
@ -155,13 +149,10 @@ spec:
kubeProxy: kubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: image: registry.k8s.io/kube-scheduler:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-scheduler:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
@ -173,9 +164,6 @@ spec:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
podInfraContainerImage: registry.k8s.io/pause:3.9 podInfraContainerImage: registry.k8s.io/pause:3.9
@ -186,7 +174,7 @@ spec:
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
kubernetesApiAccess: kubernetesApiAccess:
- 0.0.0.0/0 - 0.0.0.0/0
kubernetesVersion: 1.26.0 kubernetesVersion: 1.32.0
masterKubelet: masterKubelet:
cgroupDriver: systemd cgroupDriver: systemd
cgroupRoot: / cgroupRoot: /
@ -195,9 +183,6 @@ spec:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
podInfraContainerImage: registry.k8s.io/pause:3.9 podInfraContainerImage: registry.k8s.io/pause:3.9

48
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -26,10 +26,7 @@ APIServerConfig:
- https://127.0.0.1:4001 - https://127.0.0.1:4001
etcdServersOverrides: etcdServersOverrides:
- /events#https://127.0.0.1:4002 - /events#https://127.0.0.1:4002
featureGates: image: registry.k8s.io/kube-apiserver:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-apiserver:v1.26.0
kubeletPreferredAddressTypes: kubeletPreferredAddressTypes:
- InternalIP - InternalIP
- Hostname - Hostname
@ -59,21 +56,23 @@ APIServerConfig:
-----END RSA PUBLIC KEY----- -----END RSA PUBLIC KEY-----
Assets: Assets:
amd64: amd64:
- b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet - 5ad4965598773d56a37a8e8429c3dc3d86b4c5c26d8417ab333ae345c053dae2@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet
- b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz
- f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - f8b2d935d1f86003f4e0c1af3b9f0d2820bacabe6dc9f562785b74af24c5e468@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-amd64.tar.gz
- a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.amd64
- 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz
- d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz
- f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
- 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
arm64: arm64:
- fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet - bda9b2324c96693b38c41ecea051bab4c7c434be5683050b5e19025b50dbc0bf@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet
- 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ba4004f98f3d3a7b7d2954ff0a424caa2c2b06b78c17b1dccf2acc76a311a896@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz
- 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 - 48d0a8461ae829b12b07c3663b14b70287d0607a0792719c51b4e4dd700b02ce@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-arm64.tar.gz
- 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.arm64
- d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz - d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz
- 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz - 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz
- 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64
@ -239,19 +238,13 @@ ControlPlaneConfig:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
clusterName: cas-priority-expander-custom.example.com clusterName: cas-priority-expander-custom.example.com
configureCloudRoutes: false configureCloudRoutes: false
featureGates: image: registry.k8s.io/kube-controller-manager:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-controller-manager:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
KubeScheduler: KubeScheduler:
featureGates: image: registry.k8s.io/kube-scheduler:v1.32.0
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
image: registry.k8s.io/kube-scheduler:v1.26.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
@ -282,7 +275,7 @@ KeypairIDs:
KubeProxy: KubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
KubeletConfig: KubeletConfig:
cgroupDriver: systemd cgroupDriver: systemd
@ -292,9 +285,6 @@ KubeletConfig:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
nodeLabels: nodeLabels:
@ -309,7 +299,7 @@ KubeletConfig:
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
taints: taints:
- node-role.kubernetes.io/control-plane=:NoSchedule - node-role.kubernetes.io/control-plane=:NoSchedule
KubernetesVersion: 1.26.0 KubernetesVersion: 1.32.0
Networking: Networking:
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
@ -322,8 +312,8 @@ configStore:
containerdConfig: containerdConfig:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
etcdManifests: etcdManifests:
- memfs://clusters.example.com/cas-priority-expander-custom.example.com/manifests/etcd/main-master-us-test-1a.yaml - memfs://clusters.example.com/cas-priority-expander-custom.example.com/manifests/etcd/main-master-us-test-1a.yaml
- memfs://clusters.example.com/cas-priority-expander-custom.example.com/manifests/etcd/events-master-us-test-1a.yaml - memfs://clusters.example.com/cas-priority-expander-custom.example.com/manifests/etcd/events-master-us-test-1a.yaml

33
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content
View File

@ -1,18 +1,20 @@
Assets: Assets:
amd64: amd64:
- b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet - 5ad4965598773d56a37a8e8429c3dc3d86b4c5c26d8417ab333ae345c053dae2@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet
- b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz
- f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - f8b2d935d1f86003f4e0c1af3b9f0d2820bacabe6dc9f562785b74af24c5e468@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-amd64.tar.gz
- a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.amd64
- 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz
- d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz
arm64: arm64:
- fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet - bda9b2324c96693b38c41ecea051bab4c7c434be5683050b5e19025b50dbc0bf@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet
- 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ba4004f98f3d3a7b7d2954ff0a424caa2c2b06b78c17b1dccf2acc76a311a896@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz
- 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 - 48d0a8461ae829b12b07c3663b14b70287d0607a0792719c51b4e4dd700b02ce@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-arm64.tar.gz
- 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.arm64
- d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz - d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz
- 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz - 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz
CAs: {} CAs: {}
@ -26,7 +28,7 @@ KeypairIDs:
KubeProxy: KubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
KubeletConfig: KubeletConfig:
cgroupDriver: systemd cgroupDriver: systemd
@ -36,9 +38,6 @@ KubeletConfig:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
nodeLabels: nodeLabels:
@ -49,7 +48,7 @@ KubeletConfig:
registerSchedulable: true registerSchedulable: true
shutdownGracePeriod: 30s shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
KubernetesVersion: 1.26.0 KubernetesVersion: 1.32.0
Networking: Networking:
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
@ -57,7 +56,7 @@ UpdatePolicy: automatic
containerdConfig: containerdConfig:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
usesLegacyGossip: false usesLegacyGossip: false
usesNoneDNS: false usesNoneDNS: false

33
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content
View File

@ -1,18 +1,20 @@
Assets: Assets:
amd64: amd64:
- b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet - 5ad4965598773d56a37a8e8429c3dc3d86b4c5c26d8417ab333ae345c053dae2@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet
- b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz
- f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - f8b2d935d1f86003f4e0c1af3b9f0d2820bacabe6dc9f562785b74af24c5e468@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-amd64.tar.gz
- a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.amd64
- 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz
- d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz
arm64: arm64:
- fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet - bda9b2324c96693b38c41ecea051bab4c7c434be5683050b5e19025b50dbc0bf@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet
- 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ba4004f98f3d3a7b7d2954ff0a424caa2c2b06b78c17b1dccf2acc76a311a896@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz
- 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 - 48d0a8461ae829b12b07c3663b14b70287d0607a0792719c51b4e4dd700b02ce@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-arm64.tar.gz
- 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.arm64
- d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz - d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz
- 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz - 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz
CAs: {} CAs: {}
@ -26,7 +28,7 @@ KeypairIDs:
KubeProxy: KubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
KubeletConfig: KubeletConfig:
cgroupDriver: systemd cgroupDriver: systemd
@ -36,9 +38,6 @@ KubeletConfig:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
nodeLabels: nodeLabels:
@ -49,7 +48,7 @@ KubeletConfig:
registerSchedulable: true registerSchedulable: true
shutdownGracePeriod: 30s shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
KubernetesVersion: 1.26.0 KubernetesVersion: 1.32.0
Networking: Networking:
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
@ -57,7 +56,7 @@ UpdatePolicy: automatic
containerdConfig: containerdConfig:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
usesLegacyGossip: false usesLegacyGossip: false
usesNoneDNS: false usesNoneDNS: false

33
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -1,18 +1,20 @@
Assets: Assets:
amd64: amd64:
- b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubelet - 5ad4965598773d56a37a8e8429c3dc3d86b4c5c26d8417ab333ae345c053dae2@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet
- b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl - 646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70@https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz - 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-amd64-v1.6.1.tgz
- f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64 - f8b2d935d1f86003f4e0c1af3b9f0d2820bacabe6dc9f562785b74af24c5e468@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-amd64.tar.gz
- a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.amd64
- 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz - 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz
- d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz - d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-amd64.tar.gz
arm64: arm64:
- fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubelet - bda9b2324c96693b38c41ecea051bab4c7c434be5683050b5e19025b50dbc0bf@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubelet
- 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.26.0/bin/linux/arm64/kubectl - ba4004f98f3d3a7b7d2954ff0a424caa2c2b06b78c17b1dccf2acc76a311a896@https://dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.32.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz,https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz - f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz,https://github.com/containernetworking/plugins/releases/download/v1.6.1/cni-plugins-linux-arm64-v1.6.1.tgz
- 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64 - 48d0a8461ae829b12b07c3663b14b70287d0607a0792719c51b4e4dd700b02ce@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-arm64.tar.gz
- 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.arm64
- d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz - d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d@https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz
- 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz - 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925@https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-arm64.tar.gz
CAs: {} CAs: {}
@ -26,7 +28,7 @@ KeypairIDs:
KubeProxy: KubeProxy:
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
cpuRequest: 100m cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0 image: registry.k8s.io/kube-proxy:v1.32.0
logLevel: 2 logLevel: 2
KubeletConfig: KubeletConfig:
cgroupDriver: systemd cgroupDriver: systemd
@ -36,9 +38,6 @@ KubeletConfig:
clusterDomain: cluster.local clusterDomain: cluster.local
enableDebuggingHandlers: true enableDebuggingHandlers: true
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
featureGates:
CSIMigrationAWS: "true"
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2 logLevel: 2
nodeLabels: nodeLabels:
@ -49,7 +48,7 @@ KubeletConfig:
registerSchedulable: true registerSchedulable: true
shutdownGracePeriod: 30s shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s shutdownGracePeriodCriticalPods: 10s
KubernetesVersion: 1.26.0 KubernetesVersion: 1.32.0
Networking: Networking:
nonMasqueradeCIDR: 100.64.0.0/10 nonMasqueradeCIDR: 100.64.0.0/10
serviceClusterIPRange: 100.64.0.0/13 serviceClusterIPRange: 100.64.0.0/13
@ -57,7 +56,7 @@ UpdatePolicy: automatic
containerdConfig: containerdConfig:
logLevel: info logLevel: info
runc: runc:
version: 1.1.5 version: 1.1.14
version: 1.6.20 version: 1.7.22
usesLegacyGossip: false usesLegacyGossip: false
usesNoneDNS: false usesNoneDNS: false

2
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/in-v1alpha2.yaml
View File

@ -30,7 +30,7 @@ spec:
- instanceGroup: master-us-test-1a - instanceGroup: master-us-test-1a
name: us-test-1a name: us-test-1a
name: events name: events
kubernetesVersion: v1.26.0 kubernetesVersion: v1.32.0
masterInternalName: api.internal.cas-priority-expander-custom.example.com masterInternalName: api.internal.cas-priority-expander-custom.example.com
masterPublicName: api.cas-priority-expander-custom.example.com masterPublicName: api.cas-priority-expander-custom.example.com
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16

8
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/kubernetes.tf
View File

@ -536,7 +536,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-cas-priority-expander-
http_endpoint = "enabled" http_endpoint = "enabled"
http_protocol_ipv6 = "disabled" http_protocol_ipv6 = "disabled"
http_put_response_hop_limit = 1 http_put_response_hop_limit = 1
http_tokens = "optional" http_tokens = "required"
} }
monitoring { monitoring {
enabled = false enabled = false
@ -618,7 +618,7 @@ resource "aws_launch_template" "nodes-cas-priority-expander-custom-example-com"
http_endpoint = "enabled" http_endpoint = "enabled"
http_protocol_ipv6 = "disabled" http_protocol_ipv6 = "disabled"
http_put_response_hop_limit = 1 http_put_response_hop_limit = 1
http_tokens = "optional" http_tokens = "required"
} }
monitoring { monitoring {
enabled = false enabled = false
@ -691,7 +691,7 @@ resource "aws_launch_template" "nodes-high-priority-cas-priority-expander-custom
http_endpoint = "enabled" http_endpoint = "enabled"
http_protocol_ipv6 = "disabled" http_protocol_ipv6 = "disabled"
http_put_response_hop_limit = 1 http_put_response_hop_limit = 1
http_tokens = "optional" http_tokens = "required"
} }
monitoring { monitoring {
enabled = false enabled = false
@ -764,7 +764,7 @@ resource "aws_launch_template" "nodes-low-priority-cas-priority-expander-custom-
http_endpoint = "enabled" http_endpoint = "enabled"
http_protocol_ipv6 = "disabled" http_protocol_ipv6 = "disabled"
http_put_response_hop_limit = 1 http_put_response_hop_limit = 1
http_tokens = "optional" http_tokens = "required"
} }
monitoring { monitoring {
enabled = false enabled = false

2
tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data
View File

@ -130,7 +130,7 @@ ClusterName: cas-priority-expander.example.com
ConfigBase: memfs://clusters.example.com/cas-priority-expander.example.com ConfigBase: memfs://clusters.example.com/cas-priority-expander.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: esCkj8xtANMAq+yucbrXCk+MO2IXoC6224YmTA+HOaA= NodeupConfigHash: 2i3Echy2jd9quqT4bMoIwCrXNtsAxxqPsxCPNDtnN/k=
__EOF_KUBE_ENV __EOF_KUBE_ENV

2
tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data
View File

@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.cas-priority-expander.example.com:3988/ - https://kops-controller.internal.cas-priority-expander.example.com:3988/
InstanceGroupName: nodes-high-priority InstanceGroupName: nodes-high-priority
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: df729KN5+gvvqaKyGX1Phg5EnmFTHt0M+RCCyN9ON94= NodeupConfigHash: JPyeSn18V3EwaQubqiDkWXF1m+XUi1F+f1mSMxoUC+U=
__EOF_KUBE_ENV __EOF_KUBE_ENV

Some files were not shown because too many files have changed in this diff Show More