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

Merge pull request #15670 from johngmyers/aws-ccm 

Fix AWS CCM defaults for IPAM to match KCM
This commit is contained in:
Kubernetes Prow Robot 2023-08-16 07:22:27 -07:00 committed by GitHub
parent 99e6909693 866dc517ed
commit 73159cd6f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
206 changed files with 209 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/model/components/awscloudcontrollermanager.go
View File

@ -55,22 +55,16 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
eccm.ClusterName = b.ClusterName
eccm.ClusterCIDR = clusterSpec.Networking.NonMasqueradeCIDR
eccm.AllocateNodeCIDRs = fi.PtrTo(!clusterSpec.IsKopsControllerIPAM())
eccm.AllocateNodeCIDRs = fi.PtrTo(true)
eccm.ConfigureCloudRoutes = fi.PtrTo(false)
if eccm.ClusterCIDR == "" && !clusterSpec.IsKopsControllerIPAM() {
eccm.ClusterCIDR = clusterSpec.Networking.PodCIDR
}
// TODO: we want to consolidate this with the logic from KCM
networking := &clusterSpec.Networking
if networking.Kubenet != nil {
eccm.ConfigureCloudRoutes = fi.PtrTo(true)
} else if networking.GCP != nil {
eccm.ConfigureCloudRoutes = fi.PtrTo(false)
eccm.CIDRAllocatorType = fi.PtrTo("CloudAllocator")
if eccm.ClusterCIDR == "" {
eccm.ClusterCIDR = clusterSpec.Networking.PodCIDR
}
} else if networking.External != nil {
eccm.ConfigureCloudRoutes = fi.PtrTo(false)
} else if UsesCNI(networking) {

2
tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.2

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: eaac3475bfd301cbce7dc31d1b3ebffc956580c879bcd84690ecb82c88641855
manifestHash: 0ff974e13ec519948db39a69d054f65ce4404b17b19206e7e7fcf28de958d80c
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

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

@ -20,7 +20,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -163,7 +163,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 97b946fdac709c8f174e6719555910cffff4e26ca5b7028bf3007570e397b427
manifestHash: f8cc45fc5a0b2201f2811e4b21c9a4237a322fc2cf14c5322c9aeae061897cc1
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=bastionuserdata.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 4221d7d4646366d1b1077aa216df095836881b1dd6be8b9c627cc15d3232bbb7
manifestHash: f6b072cfa1a9134ca0106e856b2a70b2f0dca749991583de4cd3f87ccc7dccd3
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

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

@ -18,7 +18,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: bastionuserdata.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -34,7 +34,7 @@ spec:
- args:
- --allocate-node-cidrs=true
- --cloud-provider=aws
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=cas-priority-expander-custom.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 18804ce8c98f30e1bfae1d47557d18e2641cfb4eb4b5112130815ef590686c1e
manifestHash: 399257cb8c9aa2d7401eb4e3e12aede61a31d40434718f61dec8763854b01857
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

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

@ -17,7 +17,7 @@ spec:
cloudControllerManager:
allocateNodeCIDRs: true
cloudProvider: aws
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: cas-priority-expander-custom.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -34,7 +34,7 @@ spec:
- args:
- --allocate-node-cidrs=true
- --cloud-provider=aws
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=cas-priority-expander.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 1b6d82becbcf78a301a886a0a1e1f0f9b4f0ce3908feae5bf01a2684d8ca859a
manifestHash: 645e8940c7771bdf712ce127b84e68baa44097cffc8f905ac42bb2d1e284c0b5
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

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

@ -17,7 +17,7 @@ spec:
cloudControllerManager:
allocateNodeCIDRs: true
cloudProvider: aws
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: cas-priority-expander.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

2
tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content
View File

@ -34,7 +34,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: complex.example.com
configureCloudRoutes: false
enableLeaderMigration: true

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=complex.example.com
- --configure-cloud-routes=false
- --enable-leader-migration=true

2
tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content
View File

@ -113,7 +113,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 6ffef86e2c71c3ff619faf398b8e8330d0b513aaa238e4356aca7ce9289d2e8a
manifestHash: 9f2124a3cd64512b87897b80a3e8eea5bd3bff91ff77102394b1fdcb86c98686
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: compress.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=compress.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content
View File

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 91255c7cb32728919a1e8bb018c11449b60108f45ad784aaecfea15e6f7546ca
manifestHash: 3cacb886dcc54c79396c05b19c3fe7c66842571156a3dda71e6f28a2b5d66bb9
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: containerd.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=containerd.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content
View File

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 090f13557812c33392a17c0479ad7a5ee061049d8a6b3fa1160a3875e59f83bb
manifestHash: 48e0169d461e7b741442985ca61df93aee9f678a5072c350ffee2226ea22aa6c
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: containerd.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=containerd.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content
View File

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 090f13557812c33392a17c0479ad7a5ee061049d8a6b3fa1160a3875e59f83bb
manifestHash: 48e0169d461e7b741442985ca61df93aee9f678a5072c350ffee2226ea22aa6c
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=123.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content
View File

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: de417125cdf704070e3d6a4b68a419b88c630bc11177ef8bbab2c38c6844dd49
manifestHash: 423d0e938aaa568717523a529e3dada7d2c5d4b43dbea36266bdf658991fd9b1
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: 123.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

2
tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: existing-iam.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=existing-iam.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content
View File

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: d825d567335503cd6cf8eff2a215dd4a274ae2278c948fab5fe7dd02812153cf
manifestHash: 90172ec59c913aec647fd51bc2341c6d74ba74656655978e2e66982ed4d22cec
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content
View File

@ -19,7 +19,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: existingsg.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=existingsg.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content
View File

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 5cb8090e61f28e0b60a2e32f46fee0c5c1f31272b1248419ce3e5942a0710033
manifestHash: 0c3538b4938e12f7f63ee5da668ba2ae8789e10b067a52b44cd0f85bccc35ae6
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 7664ee5608865dda8b51b660348c7724eaaae1c2dec58f7031c75fd10d202d15
manifestHash: eff0c442541bc156d4c1d3e1632794c90f1c31e92a88f129d4b0e30baf7bc920
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 97b946fdac709c8f174e6719555910cffff4e26ca5b7028bf3007570e397b427
manifestHash: f8cc45fc5a0b2201f2811e4b21c9a4237a322fc2cf14c5322c9aeae061897cc1
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: externallb.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=externallb.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content
View File

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 5b3de0310582c3542a274c756286d950d0e679a1a4e2273c5da19ed04ad824e6
manifestHash: 7260106b6e7ecd95bcbe5103d88d0405bd58a5a18dd841888092d01a1461bd55
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content
View File

@ -21,7 +21,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: externalpolicies.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=externalpolicies.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content
View File

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: c9eff183a89f7883596efd5f375a0a847b7dfdefb9d0930770392d8661b5d19f
manifestHash: d25f26354370f22981085e0b254f3328cac6bd60ba891ebd24d2654f17fa27f7
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: ha.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=ha.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content
View File

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 9b5e777ee30b796cad97bf147cbe1385d48408ab4abc316a8f783821b38cc7d7
manifestHash: 8d7859ee77cd3a3e07d084cf48eb64d9232554859f0225be5df0fbfeb6f209f0
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content
View File

@ -18,7 +18,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -163,7 +163,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 7664ee5608865dda8b51b660348c7724eaaae1c2dec58f7031c75fd10d202d15
manifestHash: eff0c442541bc156d4c1d3e1632794c90f1c31e92a88f129d4b0e30baf7bc920
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.3

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: dcd605e354aff1e3bbb866f38f52cc4b5daa327a22eee543a38af824a2233453
manifestHash: 4760a1ac5de7056dc7865c904f2717b800d66b7f46e6337687c2c1b3d14c344a
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content
View File

@ -21,7 +21,7 @@ spec:
cloudControllerManager:
allocateNodeCIDRs: true
cloudProvider: aws
clusterCIDR: 172.20.0.0/16
clusterCIDR: 172.20.128.0/17
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -34,7 +34,7 @@ spec:
- args:
- --allocate-node-cidrs=true
- --cloud-provider=aws
- --cluster-cidr=172.20.0.0/16
- --cluster-cidr=172.20.128.0/17
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -186,7 +186,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 7f568c3bb4686dcafba3c2676e97848bf9936e4af5f1acd64d224a4553d2c046
manifestHash: 1e499302a8a1314eb02093ad0ee3d085025cd2ec47a57e6738676ea742f29671
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content
View File

@ -21,7 +21,7 @@ spec:
cloudControllerManager:
allocateNodeCIDRs: true
cloudProvider: aws
clusterCIDR: 172.20.0.0/16
clusterCIDR: 172.20.128.0/17
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.17

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

@ -34,7 +34,7 @@ spec:
- args:
- --allocate-node-cidrs=true
- --cloud-provider=aws
- --cluster-cidr=172.20.0.0/16
- --cluster-cidr=172.20.128.0/17
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -193,7 +193,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: ea5dacadd85ab3b76aa141cb94c5a155695093723152974b75d89ce0b978e65a
manifestHash: 53634dcc4def3594db7290fb77ad925c830209d585b2308b7f39da9d2b16f97e
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content
View File

@ -21,7 +21,7 @@ spec:
cloudControllerManager:
allocateNodeCIDRs: true
cloudProvider: aws
clusterCIDR: 172.20.0.0/16
clusterCIDR: 172.20.128.0/17
clusterName: minimal.example.com
configureCloudRoutes: false
enableLeaderMigration: true

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

@ -34,7 +34,7 @@ spec:
- args:
- --allocate-node-cidrs=true
- --cloud-provider=aws
- --cluster-cidr=172.20.0.0/16
- --cluster-cidr=172.20.128.0/17
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --enable-leader-migration=true

2
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -193,7 +193,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 410acbecc5577bece65217cd27be1d0a307cbacd5e7a9d274a54a76e4bec242d
manifestHash: 0e04eebc3901d062585b8aa954f3bfc875b321e6bbf68b72d53a28e14dc8fc4b
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content
View File

@ -21,7 +21,7 @@ spec:
cloudControllerManager:
allocateNodeCIDRs: true
cloudProvider: aws
clusterCIDR: 172.20.0.0/16
clusterCIDR: 172.20.128.0/17
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.3

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

@ -34,7 +34,7 @@ spec:
- args:
- --allocate-node-cidrs=true
- --cloud-provider=aws
- --cluster-cidr=172.20.0.0/16
- --cluster-cidr=172.20.128.0/17
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -193,7 +193,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 616536ab198d8686569086349f666ef092c24d35ad69e8d49224fa4bcef8b3cc
manifestHash: 389dca50e8dba75c84709bf7048ef7249b8aeb550426dfbced7b5cc8a0688fe2
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content
View File

@ -21,7 +21,7 @@ spec:
cloudControllerManager:
allocateNodeCIDRs: true
cloudProvider: aws
clusterCIDR: 172.20.0.0/16
clusterCIDR: 172.20.128.0/17
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -34,7 +34,7 @@ spec:
- args:
- --allocate-node-cidrs=true
- --cloud-provider=aws
- --cluster-cidr=172.20.0.0/16
- --cluster-cidr=172.20.128.0/17
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -194,7 +194,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 7f568c3bb4686dcafba3c2676e97848bf9936e4af5f1acd64d224a4553d2c046
manifestHash: 1e499302a8a1314eb02093ad0ee3d085025cd2ec47a57e6738676ea742f29671
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
View File

@ -21,7 +21,7 @@ spec:
cloudControllerManager:
allocateNodeCIDRs: true
cloudProvider: aws
clusterCIDR: 172.20.0.0/16
clusterCIDR: 172.20.128.0/17
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -34,7 +34,7 @@ spec:
- args:
- --allocate-node-cidrs=true
- --cloud-provider=aws
- --cluster-cidr=172.20.0.0/16
- --cluster-cidr=172.20.128.0/17
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -186,7 +186,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 7fdd9a9031a4d1918cf34eb784504fa60e4929db4c6627b06685d72875f8f3ff
manifestHash: 8b8cf7626c8822663942d5624f8e95b4689d15bd1da1bac3fa1050ccc1082e03
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content
View File

@ -20,7 +20,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 172.20.0.0/16
clusterCIDR: 172.20.128.0/17
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=172.20.0.0/16
- --cluster-cidr=172.20.128.0/17
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -186,7 +186,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 656bb9874cea453dae552963c82751b734464caf77bb5b75d18a648a765523e4
manifestHash: 55d45ed42fb1eddc545dd5e64ba4d38f138a64689d04f19c8a247eef64f41ccb
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
enableLeaderMigration: true

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --enable-leader-migration=true

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

@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 3b8c826de1e94374b938cd2a264c0171a14ffa8b8a15bd97ba329e004be7a08e
manifestHash: 87dd4d1bf305fe6d6324f85668e65eeed8b5d2ccbf99b4e43d867b7cd3ec8a84
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.3

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 678ff2bf4b436233e78f734512bdaac4715a94b8653b248a826019943872afc6
manifestHash: 719a27c700bbadd1ccce11f14211be614bd85969b88d89cb272412196384d6ec
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 7664ee5608865dda8b51b660348c7724eaaae1c2dec58f7031c75fd10d202d15
manifestHash: eff0c442541bc156d4c1d3e1632794c90f1c31e92a88f129d4b0e30baf7bc920
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.2

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: eaac3475bfd301cbce7dc31d1b3ebffc956580c879bcd84690ecb82c88641855
manifestHash: 0ff974e13ec519948db39a69d054f65ce4404b17b19206e7e7fcf28de958d80c
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content
View File

@ -18,7 +18,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

2
tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -92,7 +92,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 7664ee5608865dda8b51b660348c7724eaaae1c2dec58f7031c75fd10d202d15
manifestHash: eff0c442541bc156d4c1d3e1632794c90f1c31e92a88f129d4b0e30baf7bc920
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal-etcd.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal-etcd.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 79e87e72ff6f872c5f6a710dbe9c05711f3037185d9bbd19e66861a7ca5b2b4a
manifestHash: 3091ebe1ccd690995dc4be515e3c61b12ce8cafc78ee0e953a4d8f68b4f45b40
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content
View File

@ -16,7 +16,7 @@ spec:
manageStorageClasses: true
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.64.0.0/10
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6

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

@ -33,7 +33,7 @@ spec:
containers:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.64.0.0/10
- --cluster-cidr=100.96.0.0/11
- --cluster-name=minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true

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

@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 7664ee5608865dda8b51b660348c7724eaaae1c2dec58f7031c75fd10d202d15
manifestHash: eff0c442541bc156d4c1d3e1632794c90f1c31e92a88f129d4b0e30baf7bc920
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

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