Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated cherry pick of #15866: Default to 100.64.0.0/13 as IPv4 service cluster IP range #15870

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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%
Expand All @@ -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%
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-----
Expand Down Expand Up @@ -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%
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: XbCJqHyJ7SRbUfztqh5+TQKQgMiGI7NOmCqlUsKqEfA=
NodeupConfigHash: ArbHCUg1eDddnkTJCRlQREsPoFTWhgA9I6eq1TePOMs=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ ConfigServer:
- https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: FBvQ2jGSdx5Z4Yc++O63eYHPbQ41JJJt3lx+zdAI4wU=
NodeupConfigHash: v2XodnplzENJXadmxd+2pvpL1XivAOEzSsji/WH1kDQ=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.23.0
Expand All @@ -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%
Expand All @@ -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%
Expand Down Expand Up @@ -235,7 +235,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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-----
Expand Down Expand Up @@ -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%
Expand Down Expand Up @@ -314,7 +314,7 @@ KubernetesVersion: 1.23.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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand All @@ -52,7 +52,7 @@ KubernetesVersion: 1.23.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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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%
Expand All @@ -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%
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-----
Expand Down Expand Up @@ -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%
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading
Loading