From 1fbc4a77668e33c6772785ee3ab4dd1bee557a9f Mon Sep 17 00:00:00 2001
From: oldthreefeng <louisehong4168@gmail.com>
Date: Mon, 28 Jun 2021 23:05:16 +0800
Subject: [PATCH] fixed to add cni config to show default yaml

Signed-off-by: oldthreefeng <louisehong4168@gmail.com>
---
 cmd/cni.go         | 73 ++++++++++++++++++++++++++++++++++++++++++++++
 net/calico_yaml.go |  2 ++
 2 files changed, 75 insertions(+)
 create mode 100644 cmd/cni.go

diff --git a/cmd/cni.go b/cmd/cni.go
new file mode 100644
index 000000000..180285093
--- /dev/null
+++ b/cmd/cni.go
@@ -0,0 +1,73 @@
+/*
+Copyright © 2021 NAME HERE <EMAIL ADDRESS>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/fanux/sealos/net"
+	"github.com/spf13/cobra"
+	"github.com/wonderivan/logger"
+)
+
+var cniType string
+var version string
+
+// cniCmd represents the cni command
+var cniCmd = &cobra.Command{
+	Use:   "cni",
+	Short: "A brief description of your command",
+	Long: `A longer description that spans multiple lines and likely contains examples
+and usage of using your command. For example:
+
+Cobra is a CLI library for Go that empowers applications.
+This application is a tool to generate the needed files
+to quickly create a Cobra application.`,
+	Run: func(cmd *cobra.Command, args []string) {
+		if cniType != "calico" && cniType != "flannel" && cniType != "cilium" {
+			logger.Error("unsupport cni: ", cniType)
+			return 
+		}
+		if version == "" {
+			logger.Error("k8s version should not nil ", version)
+			return
+		}
+		yaml := net.NewNetwork(cniType, net.MetaData{
+			Interface: "interface=eth.*|en.*|em.*",
+			IPIP:      true,
+			MTU:       "1440",
+			K8sVersion: version,
+		}).Manifests("")
+		fmt.Println(yaml)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(cniCmd)
+
+	cniCmd.Flags().StringVarP(&cniType,"cni-type", "t", "calico", "print cni yaml")
+	cniCmd.Flags().StringVarP(&version,"version", "v", "", "k8s version to adpat the cni version like v1.21.0")
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// cniCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// cniCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}
diff --git a/net/calico_yaml.go b/net/calico_yaml.go
index 736cf951b..663cbcdbd 100644
--- a/net/calico_yaml.go
+++ b/net/calico_yaml.go
@@ -3651,6 +3651,8 @@ spec:
             # Auto-detect the BGP IP address.
             - name: IP
               value: "autodetect"
+			- name: IP_AUTODETECTION_METHOD	
+              value: "{{ .Interface }}"
             # Enable IPIP
             - name: CALICO_IPV4POOL_IPIP
               value: "{{if not .IPIP }}Off{{else}}Always{{end}}"