Merge pull request #872 from 24sama/v2.0.0

fix kubeovn yaml lint bug
kubesphere · Dec 13, 2021 · 80c878c · 80c878c
2 parents 2b63e11 + f900f21
commit 80c878c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/plugins/network/tasks.go b/pkg/plugins/network/tasks.go
@@ -179,8 +179,8 @@ func (g *GenerateKubeOVNNew) Execute(runtime connector.Runtime) error {
 	}
 
 	templateAction := action.Template{
-		Template: templates.KubeOVNOld,
-		Dst:      filepath.Join(common.KubeConfigDir, templates.KubeOVNOld.Name()),
+		Template: templates.KubeOVNNew,
+		Dst:      filepath.Join(common.KubeConfigDir, templates.KubeOVNNew.Name()),
 		Data: util.Data{
 			"Address":             address,
 			"Count":               count,

diff --git a/pkg/plugins/network/templates/kubeovn_v1.16+.go b/pkg/plugins/network/templates/kubeovn_v1.16+.go
@@ -397,7 +397,7 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: ovn-central
-  namespace:  kube-system
+  namespace: kube-system
   annotations:
     kubernetes.io/description: |
       OVN components: northd, nb and sb.
@@ -528,7 +528,7 @@ kind: DaemonSet
 apiVersion: apps/v1
 metadata:
   name: ovs-ovn
-  namespace:  kube-system
+  namespace: kube-system
   annotations:
     kubernetes.io/description: |
       This daemon set launches the openvswitch daemon.