revert default cni

pkg/minikube/bootstrapper/kubeadm/default_cni.go

@@ -46,116 +46,117 @@ const defaultCNIConfig = `
 `
 
 // kicCNIConfig is the cni plugin needed for kic uses cni plugin created by kind https://github.com/kubernetes-sigs/kind/blob/03a4b519067dc308308cce735065c47a6fda1583/pkg/build/node/cni.go
-var kicCNIConfig = template.Must(template.New("kubeletServiceTemplate").Parse(`---	
-kind: ClusterRole	
-apiVersion: rbac.authorization.k8s.io/v1	
-metadata:	
-  name: kindnet	
-rules:	
-  - apiGroups:	
-    - policy	
-    resources:	
-    - podsecuritypolicies	
-    verbs:	
-    - use	
-    resourceNames: 	
-    - kindnet	
-  - apiGroups:	
-      - ""	
-    resources:	
-      - nodes	
-    verbs:	
-      - list	
-      - watch	
----	
-kind: ClusterRoleBinding	
-apiVersion: rbac.authorization.k8s.io/v1	
-metadata:	
-  name: kindnet	
-roleRef:	
-  apiGroup: rbac.authorization.k8s.io	
-  kind: ClusterRole	
-  name: kindnet	
-subjects:	
-- kind: ServiceAccount	
-  name: kindnet	
-  namespace: kube-system	
----	
-apiVersion: v1	
-kind: ServiceAccount	
-metadata:	
-  name: kindnet	
-  namespace: kube-system	
----	
-apiVersion: apps/v1	
-kind: DaemonSet	
-metadata:	
-  name: kindnet	
-  namespace: kube-system	
-  labels:	
-    tier: node	
-    app: kindnet	
-    k8s-app: kindnet	
-spec:	
-  selector:	
-    matchLabels:	
-      app: kindnet	
-  template:	
-    metadata:	
-      labels:	
-        tier: node	
-        app: kindnet	
-        k8s-app: kindnet	
-    spec:	
-      hostNetwork: true	
-      tolerations:	
-      - operator: Exists	
-        effect: NoSchedule	
-      serviceAccountName: kindnet	
-      containers:	
-      - name: kindnet-cni	
-        image: {{.ImageName}}	
-        env:	
-        - name: HOST_IP	
-          valueFrom:	
-            fieldRef:	
-              fieldPath: status.hostIP	
-        - name: POD_IP	
-          valueFrom:	
-            fieldRef:	
-              fieldPath: status.podIP	
-        - name: POD_SUBNET	
-          value: 10.244.0.0/16	
-        volumeMounts:	
-        - name: cni-cfg	
-          mountPath: /etc/cni/net.d	
-        - name: xtables-lock	
-          mountPath: /run/xtables.lock	
-          readOnly: false	
-        - name: lib-modules	
-          mountPath: /lib/modules	
-          readOnly: true	
-        resources:	
-          requests:	
-            cpu: "100m"	
-            memory: "50Mi"	
-          limits:	
-            cpu: "100m"	
-            memory: "50Mi"	
-        securityContext:	
-          privileged: false	
-          capabilities:	
-            add: ["NET_RAW", "NET_ADMIN"]	
-      volumes:	
-      - name: cni-cfg	
-        hostPath:	
-          path: /etc/cni/net.d	
-      - name: xtables-lock	
-        hostPath:	
-          path: /run/xtables.lock	
-          type: FileOrCreate	
-      - name: lib-modules	
-        hostPath:	
-          path: /lib/modules	
----	
+var kicCNIConfig = template.Must(template.New("kubeletServiceTemplate").Parse(`---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: kindnet
+rules:
+  - apiGroups:
+    - policy
+    resources:
+    - podsecuritypolicies
+    verbs:
+    - use
+    resourceNames: 
+    - kindnet
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - list
+      - watch
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: kindnet
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kindnet
+subjects:
+- kind: ServiceAccount
+  name: kindnet
+  namespace: kube-system
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: kindnet
+  namespace: kube-system
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: kindnet
+  namespace: kube-system
+  labels:
+    tier: node
+    app: kindnet
+    k8s-app: kindnet
+spec:
+  selector:
+    matchLabels:
+      app: kindnet
+  template:
+    metadata:
+      labels:
+        tier: node
+        app: kindnet
+        k8s-app: kindnet
+    spec:
+      hostNetwork: true
+      tolerations:
+      - operator: Exists
+        effect: NoSchedule
+      serviceAccountName: kindnet
+      containers:
+      - name: kindnet-cni
+        image: {{.ImageName}}
+        env:
+        - name: HOST_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        - name: POD_SUBNET
+          value: 10.244.0.0/16
+        volumeMounts:
+        - name: cni-cfg
+          mountPath: /etc/cni/net.d
+        - name: xtables-lock
+          mountPath: /run/xtables.lock
+          readOnly: false
+        - name: lib-modules
+          mountPath: /lib/modules
+          readOnly: true
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
+        securityContext:
+          privileged: false
+          capabilities:
+            add: ["NET_RAW", "NET_ADMIN"]
+      volumes:
+      - name: cni-cfg
+        hostPath:
+          path: /etc/cni/net.d
+      - name: xtables-lock
+        hostPath:
+          path: /run/xtables.lock
+          type: FileOrCreate
+      - name: lib-modules
+        hostPath:
+          path: /lib/modules
+
+---
 `))