diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 4a118125ab..0691fdfbca 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -128,7 +128,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Elzo/rIOjAxly0oM7DRFIJMLY2Tjr7Hmq2Cz9JUTy94= +NodeupConfigHash: KcnbZLY7LCbjnvOe0vHk1c3BObT1OU0HsZlfebU6dzw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index b6c3908871..37ef39267b 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -151,7 +151,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 6zBnYt9ifwaf9tP3HRh2eAUUIHkTj82HfCkWcj7QOmo= +NodeupConfigHash: Q/5lnobS7oex8BMOQc8DYbYmvZeeSSt7NgnB7WgKBYQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content index a0608127c7..15e90cc046 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -123,7 +123,7 @@ spec: securePort: 443 serviceAccountIssuer: https://discovery.example.com/minimal.example.com serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 kubeControllerManager: allocateNodeCIDRs: true @@ -153,7 +153,7 @@ spec: image: registry.k8s.io/dns/k8s-dns-node-cache:1.22.20 memoryRequest: 5Mi provider: CoreDNS - serverIP: 172.20.0.10 + serverIP: 100.64.0.10 kubeProxy: cpuRequest: 100m image: registry.k8s.io/kube-proxy:v1.26.0 @@ -171,7 +171,7 @@ spec: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -194,7 +194,7 @@ spec: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -233,7 +233,7 @@ spec: serviceAccountIssuerDiscovery: discoveryStore: memfs://discovery.example.com/minimal.example.com enableAWSOIDCProvider: true - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 snapshotController: enabled: true sshAccess: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index cc1013edcc..352a91e8ae 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -14,7 +14,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 264a628e688f29334cbc9f3d125da5bd0f6f07ee71ac80fb16fd6b66290ff092 + manifestHash: d2bbb7cbee5835c3891fe80fbacf8963508359ef9159f8480325ce9a7174f14a name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index ef70ea18c9..477b37ebbe 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -226,7 +226,7 @@ metadata: namespace: kube-system resourceVersion: "0" spec: - clusterIP: 172.20.0.10 + clusterIP: 100.64.0.10 ports: - name: dns port: 53 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 6db82beea3..bcd225277f 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -47,7 +47,7 @@ APIServerConfig: securePort: 443 serviceAccountIssuer: https://discovery.example.com/minimal.example.com serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 ServiceAccountPublicKeys: | -----BEGIN RSA PUBLIC KEY----- @@ -286,7 +286,7 @@ KubeletConfig: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -311,7 +311,7 @@ KubernetesVersion: 1.26.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content index 57f45330df..44a3e2b4d1 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -29,7 +29,7 @@ KubeletConfig: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -50,7 +50,7 @@ KubernetesVersion: 1.26.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic containerdConfig: logLevel: info diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 2e7ff5d8e0..0d8371e2d1 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -128,7 +128,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: XPWMy2SQ8swDsHPFiJFqahsEJSJZMic9Be5P49ROAjw= +NodeupConfigHash: +AXqoT7WKiDYd7aEDQVLH4k104I/W1JqNBLhRqzYEH4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data index 9518a6ec5a..833ef8fad9 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -151,7 +151,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: L5BjPzVcKn6ItKtnRRN8FQKGP6JLVg0jao+1d+9sBbc= +NodeupConfigHash: 9Kv5lCFI4fbwDje6L26P7XwurDEzYV+ZjurjhKs284U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content index bf25718e32..7ad83ebc5e 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content @@ -124,7 +124,7 @@ spec: securePort: 443 serviceAccountIssuer: https://discovery.example.com/minimal.example.com serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 kubeControllerManager: allocateNodeCIDRs: true @@ -154,7 +154,7 @@ spec: image: registry.k8s.io/dns/k8s-dns-node-cache:1.22.20 memoryRequest: 5Mi provider: CoreDNS - serverIP: 172.20.0.10 + serverIP: 100.64.0.10 kubeProxy: cpuRequest: 100m image: registry.k8s.io/kube-proxy:v1.24.0 @@ -172,7 +172,7 @@ spec: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -195,7 +195,7 @@ spec: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -234,7 +234,7 @@ spec: serviceAccountIssuerDiscovery: discoveryStore: memfs://discovery.example.com/minimal.example.com enableAWSOIDCProvider: true - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 snapshotController: enabled: true sshAccess: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index f524ffed76..a625b0bd85 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -14,7 +14,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 264a628e688f29334cbc9f3d125da5bd0f6f07ee71ac80fb16fd6b66290ff092 + manifestHash: d2bbb7cbee5835c3891fe80fbacf8963508359ef9159f8480325ce9a7174f14a name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index ef70ea18c9..477b37ebbe 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -226,7 +226,7 @@ metadata: namespace: kube-system resourceVersion: "0" spec: - clusterIP: 172.20.0.10 + clusterIP: 100.64.0.10 ports: - name: dns port: 53 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index f88ddfcd72..8bee4dd795 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -47,7 +47,7 @@ APIServerConfig: securePort: 443 serviceAccountIssuer: https://discovery.example.com/minimal.example.com serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 ServiceAccountPublicKeys: | -----BEGIN RSA PUBLIC KEY----- @@ -286,7 +286,7 @@ KubeletConfig: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -311,7 +311,7 @@ KubernetesVersion: 1.24.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content index cbb0be1acd..f5eaf8b1d5 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content @@ -29,7 +29,7 @@ KubeletConfig: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -50,7 +50,7 @@ KubernetesVersion: 1.24.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic containerdConfig: logLevel: info diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 242ece43b4..aea07ce80c 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -128,7 +128,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: mBbsPgGwaaxPpchci/m95cG5nVoPKqAXQl/wABqcKSc= +NodeupConfigHash: aR7fW9UWRlw320nnyGWrFYfvkiP6fji970Xkdr5g93o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data index 047dcb7d3b..ec8118ada0 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -151,7 +151,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 8L8jRnJMKNmWDZnBWu1MJN9cVptFH1ULcavClQS/BVI= +NodeupConfigHash: oxnAjwadN2x3LXnvGxx4yNXzkm2Fpqa8RJR2GItY850= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content index 9ca77e8324..b5a5b437c6 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content @@ -123,7 +123,7 @@ spec: securePort: 443 serviceAccountIssuer: https://discovery.example.com/minimal.example.com serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 kubeControllerManager: allocateNodeCIDRs: true @@ -153,7 +153,7 @@ spec: image: registry.k8s.io/dns/k8s-dns-node-cache:1.22.20 memoryRequest: 5Mi provider: CoreDNS - serverIP: 172.20.0.10 + serverIP: 100.64.0.10 kubeProxy: cpuRequest: 100m image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 @@ -171,7 +171,7 @@ spec: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -194,7 +194,7 @@ spec: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -233,7 +233,7 @@ spec: serviceAccountIssuerDiscovery: discoveryStore: memfs://discovery.example.com/minimal.example.com enableAWSOIDCProvider: true - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 snapshotController: enabled: true sshAccess: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index b88c18611f..e18016c478 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -14,7 +14,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 264a628e688f29334cbc9f3d125da5bd0f6f07ee71ac80fb16fd6b66290ff092 + manifestHash: d2bbb7cbee5835c3891fe80fbacf8963508359ef9159f8480325ce9a7174f14a name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index ef70ea18c9..477b37ebbe 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -226,7 +226,7 @@ metadata: namespace: kube-system resourceVersion: "0" spec: - clusterIP: 172.20.0.10 + clusterIP: 100.64.0.10 ports: - name: dns port: 53 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 676f125ed8..8462630ca2 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -47,7 +47,7 @@ APIServerConfig: securePort: 443 serviceAccountIssuer: https://discovery.example.com/minimal.example.com serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 ServiceAccountPublicKeys: | -----BEGIN RSA PUBLIC KEY----- @@ -286,7 +286,7 @@ KubeletConfig: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -311,7 +311,7 @@ KubernetesVersion: 1.25.0-rc.1 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content index d0adbe6689..5053e3b8ea 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content @@ -29,7 +29,7 @@ KubeletConfig: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -50,7 +50,7 @@ KubernetesVersion: 1.25.0-rc.1 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic containerdConfig: logLevel: info diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 2f2638fd9f..a4b2173e69 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -128,7 +128,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: wq0CCrj8vsagiWzFCdzM2C4wEILLw3QZG/S9ebj3Cl0= +NodeupConfigHash: 6DqpUUQ0BUCaERVVx1qWTcV9eJxQ1cJXAkgh0T4f/Do= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data index f02e4412e8..c32b7567a8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -151,7 +151,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 0OeT5XSzPFfU1u5b4oE0g2FBQ34WWczblFS8supuZhY= +NodeupConfigHash: IrDEdaCv/md7bGB9UX5CrEgd42bBam9udBR2iUEwlIQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content index 6e7b359350..d76fe90ac1 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content @@ -123,7 +123,7 @@ spec: securePort: 443 serviceAccountIssuer: https://discovery.example.com/minimal.example.com serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 kubeControllerManager: allocateNodeCIDRs: true @@ -160,7 +160,7 @@ spec: localIP: 169.254.20.10 memoryRequest: 5Mi provider: CoreDNS - serverIP: 172.20.0.10 + serverIP: 100.64.0.10 kubeProxy: cpuRequest: 100m image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 @@ -240,7 +240,7 @@ spec: serviceAccountIssuerDiscovery: discoveryStore: memfs://discovery.example.com/minimal.example.com enableAWSOIDCProvider: true - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 snapshotController: enabled: true sshAccess: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index c3774fe28a..598d2c6513 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -14,7 +14,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 264a628e688f29334cbc9f3d125da5bd0f6f07ee71ac80fb16fd6b66290ff092 + manifestHash: d2bbb7cbee5835c3891fe80fbacf8963508359ef9159f8480325ce9a7174f14a name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index ef70ea18c9..477b37ebbe 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -226,7 +226,7 @@ metadata: namespace: kube-system resourceVersion: "0" spec: - clusterIP: 172.20.0.10 + clusterIP: 100.64.0.10 ports: - name: dns port: 53 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 1c678dabc8..85f12c2486 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -47,7 +47,7 @@ APIServerConfig: securePort: 443 serviceAccountIssuer: https://discovery.example.com/minimal.example.com serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 ServiceAccountPublicKeys: | -----BEGIN RSA PUBLIC KEY----- @@ -311,7 +311,7 @@ KubernetesVersion: 1.26.0-alpha.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content index 164b40d4f1..dfab5e9833 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content @@ -50,7 +50,7 @@ KubernetesVersion: 1.26.0-alpha.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic containerdConfig: logLevel: info diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 2bbe686dd7..19e1ad1361 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -128,7 +128,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: sLzi++zH+DdlGaBG+eXxqYJG3df0raToM2m8BvS66no= +NodeupConfigHash: wdZGrlGt44zutqlcirdfJWHWQH+3auZZeFvWU8Ee6NA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data index b6c3908871..37ef39267b 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -151,7 +151,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 6zBnYt9ifwaf9tP3HRh2eAUUIHkTj82HfCkWcj7QOmo= +NodeupConfigHash: Q/5lnobS7oex8BMOQc8DYbYmvZeeSSt7NgnB7WgKBYQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content index cbf2010620..001cdb89f8 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content @@ -122,7 +122,7 @@ spec: securePort: 443 serviceAccountIssuer: https://api.internal.minimal.example.com serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 kubeControllerManager: allocateNodeCIDRs: true @@ -152,7 +152,7 @@ spec: image: registry.k8s.io/dns/k8s-dns-node-cache:1.22.20 memoryRequest: 5Mi provider: CoreDNS - serverIP: 172.20.0.10 + serverIP: 100.64.0.10 kubeProxy: cpuRequest: 100m image: registry.k8s.io/kube-proxy:v1.26.0 @@ -170,7 +170,7 @@ spec: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -193,7 +193,7 @@ spec: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -229,7 +229,7 @@ spec: nonMasqueradeCIDR: 172.20.0.0/16 podCIDR: 172.20.128.0/17 secretStore: memfs://clusters.example.com/minimal.example.com/secrets - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 snapshotController: enabled: true sshAccess: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index dda79b8e3d..bcff6bccd3 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -14,7 +14,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 264a628e688f29334cbc9f3d125da5bd0f6f07ee71ac80fb16fd6b66290ff092 + manifestHash: d2bbb7cbee5835c3891fe80fbacf8963508359ef9159f8480325ce9a7174f14a name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index ef70ea18c9..477b37ebbe 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -226,7 +226,7 @@ metadata: namespace: kube-system resourceVersion: "0" spec: - clusterIP: 172.20.0.10 + clusterIP: 100.64.0.10 ports: - name: dns port: 53 diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a605dbfc3b..5e38d2f42d 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -47,7 +47,7 @@ APIServerConfig: securePort: 443 serviceAccountIssuer: https://api.internal.minimal.example.com serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 ServiceAccountPublicKeys: | -----BEGIN RSA PUBLIC KEY----- @@ -286,7 +286,7 @@ KubeletConfig: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -311,7 +311,7 @@ KubernetesVersion: 1.26.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content index 57f45330df..44a3e2b4d1 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content @@ -29,7 +29,7 @@ KubeletConfig: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -50,7 +50,7 @@ KubernetesVersion: 1.26.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic containerdConfig: logLevel: info diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 2bbe686dd7..19e1ad1361 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -128,7 +128,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: sLzi++zH+DdlGaBG+eXxqYJG3df0raToM2m8BvS66no= +NodeupConfigHash: wdZGrlGt44zutqlcirdfJWHWQH+3auZZeFvWU8Ee6NA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data index b6c3908871..37ef39267b 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -151,7 +151,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 6zBnYt9ifwaf9tP3HRh2eAUUIHkTj82HfCkWcj7QOmo= +NodeupConfigHash: Q/5lnobS7oex8BMOQc8DYbYmvZeeSSt7NgnB7WgKBYQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content index a12fc21098..c661b6daf3 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content @@ -123,7 +123,7 @@ spec: securePort: 443 serviceAccountIssuer: https://api.internal.minimal.example.com serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 kubeControllerManager: allocateNodeCIDRs: true @@ -153,7 +153,7 @@ spec: image: registry.k8s.io/dns/k8s-dns-node-cache:1.22.20 memoryRequest: 5Mi provider: CoreDNS - serverIP: 172.20.0.10 + serverIP: 100.64.0.10 kubeProxy: cpuRequest: 100m image: registry.k8s.io/kube-proxy:v1.26.0 @@ -171,7 +171,7 @@ spec: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -194,7 +194,7 @@ spec: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -230,7 +230,7 @@ spec: nonMasqueradeCIDR: 172.20.0.0/16 podCIDR: 172.20.128.0/17 secretStore: memfs://clusters.example.com/minimal.example.com/secrets - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 snapshotController: enabled: true sshAccess: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 2a255a35a6..42a0b42361 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -14,7 +14,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 264a628e688f29334cbc9f3d125da5bd0f6f07ee71ac80fb16fd6b66290ff092 + manifestHash: d2bbb7cbee5835c3891fe80fbacf8963508359ef9159f8480325ce9a7174f14a name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index ef70ea18c9..477b37ebbe 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -226,7 +226,7 @@ metadata: namespace: kube-system resourceVersion: "0" spec: - clusterIP: 172.20.0.10 + clusterIP: 100.64.0.10 ports: - name: dns port: 53 diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a605dbfc3b..5e38d2f42d 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -47,7 +47,7 @@ APIServerConfig: securePort: 443 serviceAccountIssuer: https://api.internal.minimal.example.com serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 storageBackend: etcd3 ServiceAccountPublicKeys: | -----BEGIN RSA PUBLIC KEY----- @@ -286,7 +286,7 @@ KubeletConfig: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -311,7 +311,7 @@ KubernetesVersion: 1.26.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content index 57f45330df..44a3e2b4d1 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content @@ -29,7 +29,7 @@ KubeletConfig: cgroupDriver: systemd cgroupRoot: / cloudProvider: external - clusterDNS: 172.20.0.10 + clusterDNS: 100.64.0.10 clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% @@ -50,7 +50,7 @@ KubernetesVersion: 1.26.0 Networking: amazonVPC: {} nonMasqueradeCIDR: 172.20.0.0/16 - serviceClusterIPRange: 172.20.0.0/19 + serviceClusterIPRange: 100.64.0.0/13 UpdatePolicy: automatic containerdConfig: logLevel: info