Move ConfigureCBR0 to classic only

Fixes #700
2016-10-19 11:24:40 -07:00 · 2016-10-19 11:24:40 -07:00 · be4284bc24
parent df9efe6591
commit be4284bc24
2 changed files with 5 additions and 1 deletions
--- a/upup/models/config/components/kubelet/_networking_classic/kubelet.classic.options
+++ b/upup/models/config/components/kubelet/_networking_classic/kubelet.classic.options
@ -0,0 +1,5 @@
+Kubelet:
+  # The --configure-cbr0 option was deprecated in v1.4 and removed in v1.5.
+  # Only use it when "classic" is allowed (which, by cluster validation,
+  # is only allowed for clusters <v1.4).
+  ConfigureCBR0: true
--- a/upup/models/config/components/kubelet/kubelet.options
+++ b/upup/models/config/components/kubelet/kubelet.options
@ -5,7 +5,6 @@ Kubelet:
  LogLevel: 2
  ClusterDNS: {{ WellKnownServiceIP 10 }}
  ClusterDomain: {{ .ClusterDNSDomain }}
-  ConfigureCBR0: true
  BabysitDaemons: true
  APIServers: https://{{ .MasterInternalName }}
  NonMasqueradeCIDR: {{ .NonMasqueradeCIDR }}