Merge pull request #1853 from Fsero/make_flannel_leases_configurable

bugfix: flannel SubnetLen expects an int not an string
kubernetes-retired · May 18, 2020 · bdc0325 · bdc0325
2 parents bd0633d + c54abd5
commit bdc0325
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/builtin/files/userdata/cloud-config-controller b/builtin/files/userdata/cloud-config-controller
@@ -1340,7 +1340,7 @@ write_files:
           {
             "Network": "{{ .PodCIDR }}",
             {{ if gt .Kubernetes.Networking.SelfHosting.FlannelConfig.SubnetLen 0 -}}
-            "SubnetLen": "{{ .Kubernetes.Networking.SelfHosting.FlannelConfig.SubnetLen }}",
+            "SubnetLen": "{{ int (.Kubernetes.Networking.SelfHosting.FlannelConfig.SubnetLen ) }}",
             {{- end }}
             "Backend": {
               "Type": "vxlan"
@@ -2352,7 +2352,7 @@ write_files:
           {
             "Network": "{{ .PodCIDR }}",
              {{ if gt .Kubernetes.Networking.SelfHosting.FlannelConfig.SubnetLen 0 -}}
-            "SubnetLen": "{{ .Kubernetes.Networking.SelfHosting.FlannelConfig.SubnetLen }}",
+            "SubnetLen": "{{ int (.Kubernetes.Networking.SelfHosting.FlannelConfig.SubnetLen) }}",
             {{- end }}
             "Backend": {
               "Type": "vxlan"