Merge pull request #3952 from mikesplain/fix_flannel_nonMasqueradeCIDR

Automatic merge from submit-queue. Fix Flannel nonMasqueradeCIDR Fixes #3950 ~~And looks like we forgot to bump the version in `bootstrapchannelbuilder.go`~~(moved to #3953) (thanks @jkemp101)
kubernetes · Dec 14, 2017 · 3fc8ddd · 3fc8ddd
2 parents 291edf3 + 1417f9e
commit 3fc8ddd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml.template
@@ -69,9 +69,9 @@ data:
     }
   net-conf.json: |
     {
-      "Network": "100.64.0.0/10",
+      "Network": "{{ .NonMasqueradeCIDR }}",
       "Backend": {
-        "Type": "{{FlannelBackendType}}"
+        "Type": "{{ FlannelBackendType }}"
       }
     }
 ---

diff --git a/upup/models/cloudup/resources/addons/networking.flannel/pre-k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.flannel/pre-k8s-1.6.yaml.template
@@ -26,9 +26,9 @@ data:
     }
   net-conf.json: |
     {
-      "Network": "100.64.0.0/10",
+      "Network": "{{ .NonMasqueradeCIDR }}",
       "Backend": {
-        "Type": "{{FlannelBackendType}}"
+        "Type": "{{ FlannelBackendType }}"
       }
     }
 ---