diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content index 4a1a52dc8a..b7c56032b0 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -19,7 +19,12 @@ spec: nodeIPFamilies: - ipv6 - ipv4 - cloudControllerManager: {} + cloudControllerManager: + allocateNodeCIDRs: true + clusterCIDR: ::/0 + clusterName: minimal-ipv6.example.com + configureCloudRoutes: false + image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0 cloudProvider: aws clusterDNSDomain: cluster.local configBase: memfs://clusters.example.com/minimal-ipv6.example.com diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index ef1e7d0b12..abc8a8a96c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -22,12 +22,16 @@ spec: - args: - --v=2 - --cloud-provider=aws + - --cluster-name=minimal-ipv6.example.com + - --cluster-cidr=::/0 + - --allocate-node-cidrs=true + - --configure-cloud-routes=false - --use-service-account-credentials=true - --cloud-config=/etc/kubernetes/cloud.config env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: null + image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index c39257cbb2..904dd4ce2d 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -61,7 +61,7 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: 6b51965da60eca2a9d8c4a0cd99e08d1960dbcbd84b3e1530ce9ec92cac21fb4 + manifestHash: 2177fcb1b508f6e280e888dd76cc8ac82847df6c25781e7ee90d563955a3cd9d name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content index ceb6c6f175..3e278a1d6e 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -19,7 +19,12 @@ spec: nodeIPFamilies: - ipv6 - ipv4 - cloudControllerManager: {} + cloudControllerManager: + allocateNodeCIDRs: true + clusterCIDR: ::/0 + clusterName: minimal-ipv6.example.com + configureCloudRoutes: false + image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0 cloudProvider: aws clusterDNSDomain: cluster.local configBase: memfs://clusters.example.com/minimal-ipv6.example.com diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index ef1e7d0b12..abc8a8a96c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -22,12 +22,16 @@ spec: - args: - --v=2 - --cloud-provider=aws + - --cluster-name=minimal-ipv6.example.com + - --cluster-cidr=::/0 + - --allocate-node-cidrs=true + - --configure-cloud-routes=false - --use-service-account-credentials=true - --cloud-config=/etc/kubernetes/cloud.config env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: null + image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index 3be744e6ad..a0641f21b8 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -62,7 +62,7 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: 6b51965da60eca2a9d8c4a0cd99e08d1960dbcbd84b3e1530ce9ec92cac21fb4 + manifestHash: 2177fcb1b508f6e280e888dd76cc8ac82847df6c25781e7ee90d563955a3cd9d name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content index a0c45988dd..ef5360d85e 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -19,7 +19,12 @@ spec: nodeIPFamilies: - ipv6 - ipv4 - cloudControllerManager: {} + cloudControllerManager: + allocateNodeCIDRs: true + clusterCIDR: ::/0 + clusterName: minimal-ipv6.example.com + configureCloudRoutes: false + image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0 cloudProvider: aws clusterDNSDomain: cluster.local configBase: memfs://clusters.example.com/minimal-ipv6.example.com diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index ef1e7d0b12..abc8a8a96c 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -22,12 +22,16 @@ spec: - args: - --v=2 - --cloud-provider=aws + - --cluster-name=minimal-ipv6.example.com + - --cluster-cidr=::/0 + - --allocate-node-cidrs=true + - --configure-cloud-routes=false - --use-service-account-credentials=true - --cloud-config=/etc/kubernetes/cloud.config env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: null + image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index c89a403e1f..c82712142a 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: 6b51965da60eca2a9d8c4a0cd99e08d1960dbcbd84b3e1530ce9ec92cac21fb4 + manifestHash: 2177fcb1b508f6e280e888dd76cc8ac82847df6c25781e7ee90d563955a3cd9d name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io