final changes for flannel

Author: scott coulton

manifests/service.pp

@@ -2,10 +2,10 @@
 
 class kubernetes::service (
 
-  Boolean $controller           = $kubernetes::controller,
-  Boolean $bootstrap_controller = $kubernetes::bootstrap_controller,
-  String $container_runtime     = $kubernetes::container_runtime,
-  Optional[String] $etcd_ip     = $kubernetes::etcd_ip,
+  Boolean $controller                = $kubernetes::controller,
+  Boolean $bootstrap_controller      = $kubernetes::bootstrap_controller,
+  String $container_runtime          = $kubernetes::container_runtime,
+  Optional[String] $etcd_ip          = $kubernetes::etcd_ip,
 ){
 
   $peeruls = inline_template("'{\"peerURLs\":[\"http://${etcd_ip}:2380\"]}'")

templates/kubernetes.conf.erb

@@ -6,7 +6,7 @@ Environment="KUBELET_KUBECONFIG_ARGS=--kubeconfig=/etc/kubernetes/kubelet.conf -
 	Environment="KUBELET_KUBECONFIG_ARGS=--kubeconfig=/etc/kubernetes/kubelet.conf --require-kubeconfig=true --container-runtime-endpoint=unix:///var/run/cri-containerd.sock --container-runtime=remote" 
 <% end %>
 Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests --allow-privileged=true"
-Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin <%= @cni_cluster_cidr.chomp("- ") %>"
+Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin"
 Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.local"
 Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"
 ExecStart=