From 51c2fac356ec66b0043ce5a916bb9396f399916a Mon Sep 17 00:00:00 2001 From: Maxim Ivanov Date: Wed, 6 Dec 2017 12:21:16 +0000 Subject: [PATCH] Pass ServiceCIDR to controller-manager In theory PodCIDR and ServiceCIDR can overlap, letting controller-manager know service cidr allows it to behave correctly in that case --- pkg/asset/internal/templates.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/asset/internal/templates.go b/pkg/asset/internal/templates.go index ab479badc..c8feee47a 100644 --- a/pkg/asset/internal/templates.go +++ b/pkg/asset/internal/templates.go @@ -407,6 +407,7 @@ spec: - --allocate-node-cidrs=true - --cloud-provider={{ .CloudProvider }} - --cluster-cidr={{ .PodCIDR }} + - --service-cluster-ip-range={{ .ServiceCIDR }} - --configure-cloud-routes=false - --leader-elect=true - --root-ca-file=/etc/kubernetes/secrets/ca.crt @@ -457,6 +458,7 @@ spec: - controller-manager - --allocate-node-cidrs=true - --cluster-cidr={{ .PodCIDR }} + - --service-cluster-ip-range={{ .ServiceCIDR }} - --cloud-provider={{ .CloudProvider }} - --configure-cloud-routes=false - --kubeconfig=/etc/kubernetes/kubeconfig