From 716a776d4248f3e94bba1159c96c54a5d1e40fd8 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Wed, 6 Jun 2018 23:23:20 +0200 Subject: [PATCH] Add service-node-port-range for kube-api --- cluster.yml | 2 ++ cluster/defaults.go | 2 ++ cluster/plan.go | 1 + 3 files changed, 5 insertions(+) diff --git a/cluster.yml b/cluster.yml index e1a72d4d..652ddafe 100644 --- a/cluster.yml +++ b/cluster.yml @@ -45,6 +45,8 @@ services: kube-api: service_cluster_ip_range: 10.43.0.0/16 pod_security_policy: false + # Expose a different port range for NodePort services + service_node_port_range: 30000-32767 # add additional arguments to the kubernetes component # Note that this WILL OVERRIDE existing defaults extra_args: diff --git a/cluster/defaults.go b/cluster/defaults.go index ca3957a4..35e6f977 100644 --- a/cluster/defaults.go +++ b/cluster/defaults.go @@ -11,6 +11,7 @@ import ( const ( DefaultServiceClusterIPRange = "10.43.0.0/16" + DefaultNodePortRange = "30000-32767" DefaultClusterCIDR = "10.42.0.0/16" DefaultClusterDNSService = "10.43.0.10" DefaultClusterDomain = "cluster.local" @@ -118,6 +119,7 @@ func (c *Cluster) setClusterServicesDefaults() { serviceConfigDefaultsMap := map[*string]string{ &c.Services.KubeAPI.ServiceClusterIPRange: DefaultServiceClusterIPRange, + &c.Services.KubeAPI.ServiceNodePortRange: DefaultNodePortRange, &c.Services.KubeController.ServiceClusterIPRange: DefaultServiceClusterIPRange, &c.Services.KubeController.ClusterCIDR: DefaultClusterCIDR, &c.Services.Kubelet.ClusterDNSServer: DefaultClusterDNSService, diff --git a/cluster/plan.go b/cluster/plan.go index 618316cd..b7e27da3 100644 --- a/cluster/plan.go +++ b/cluster/plan.go @@ -120,6 +120,7 @@ func (c *Cluster) BuildKubeAPIProcess(prefixPath string) v3.Process { "allow-privileged": "true", "kubelet-preferred-address-types": "InternalIP,ExternalIP,Hostname", "service-cluster-ip-range": c.Services.KubeAPI.ServiceClusterIPRange, + "service-node-port-range": c.Services.KubeAPI.ServiceNodePortRange, "admission-control": "ServiceAccount,NamespaceLifecycle,LimitRanger,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds", "storage-backend": "etcd3", "client-ca-file": pki.GetCertPath(pki.CACertName),