can create the directory for the customized cni conf and remove the c…

…ni conf file in cleanup command

Signed-off-by: Su Fei <[email protected]>

cilium/cmd/cleanup.go

@@ -41,18 +41,20 @@ working condition after uninstalling the Cilium agent.`,
 }
 
 var (
-	cleanAll bool
-	cleanBPF bool
-	force    bool
+	cleanAll      bool
+	cleanBPF      bool
+	force         bool
+	customCNIConf string
 )
 
 const (
 	allFlagName   = "all-state"
 	bpfFlagName   = "bpf-state"
 	forceFlagName = "force"
 
-	cleanCiliumEnvVar = "CLEAN_CILIUM_STATE"
-	cleanBpfEnvVar    = "CLEAN_CILIUM_BPF_STATE"
+	cleanCiliumEnvVar           = "CLEAN_CILIUM_STATE"
+	cleanBpfEnvVar              = "CLEAN_CILIUM_BPF_STATE"
+	writeCNIConfWhenReadyEnvVar = "WRITE_CNI_CONF_WHEN_READY"
 
 	tcFilterParentIngress = 0xfffffff2
 	tcFilterParentEgress  = 0xfffffff3
@@ -83,6 +85,7 @@ func init() {
 
 	bindEnv(cleanCiliumEnvVar, cleanCiliumEnvVar)
 	bindEnv(cleanBpfEnvVar, cleanBpfEnvVar)
+	bindEnv(writeCNIConfWhenReadyEnvVar, writeCNIConfWhenReadyEnvVar)
 
 	if err := vp.BindPFlags(cleanupCmd.Flags()); err != nil {
 		Fatalf("viper failed to bind to flags: %v\n", err)
@@ -232,8 +235,13 @@ func (c ciliumCleanup) whatWillBeRemoved() []string {
 		defaults.LibraryPath))
 	toBeRemoved = append(toBeRemoved, fmt.Sprintf("endpoint state in %s",
 		defaults.RuntimePath))
-	toBeRemoved = append(toBeRemoved, fmt.Sprintf("CNI configuration at %s, %s, %s, %s, %s",
-		cniConfigV1, cniConfigV2, cniConfigV3, cniConfigV4, cniConfigV5))
+	if customCNIConf != "" {
+		toBeRemoved = append(toBeRemoved, fmt.Sprintf("CNI configuration at %s, %s, %s, %s, %s, %s",
+			cniConfigV1, cniConfigV2, cniConfigV3, cniConfigV4, cniConfigV5, customCNIConf))
+	} else {
+		toBeRemoved = append(toBeRemoved, fmt.Sprintf("CNI configuration at %s, %s, %s, %s, %s",
+			cniConfigV1, cniConfigV2, cniConfigV3, cniConfigV4, cniConfigV5))
+	}
 	return toBeRemoved
 }
 
@@ -276,6 +284,8 @@ func runCleanup() {
 		os.Exit(1)
 	}
 
+	customCNIConf = vp.GetString(writeCNIConfWhenReadyEnvVar)
+
 	cleanAll = vp.GetBool(allFlagName) || vp.GetBool(cleanCiliumEnvVar)
 	cleanBPF = vp.GetBool(bpfFlagName) || vp.GetBool(cleanBpfEnvVar)
 
@@ -346,10 +356,16 @@ func removeCNI() error {
 	os.Remove(cniConfigV4)
 
 	err := os.Remove(cniConfigV5)
-	if os.IsNotExist(err) {
-		return nil
+	if err != nil && !os.IsNotExist(err) {
+		return err
 	}
-	return err
+	if customCNIConf != "" {
+		err = os.Remove(customCNIConf)
+		if err != nil && !os.IsNotExist(err) {
+			return err
+		}
+	}
+	return nil
 }
 
 // revertCNIBackup removes the ".cilium_bak" suffix from all files in cniPath,

daemon/cmd/cni/config.go

@@ -272,6 +272,11 @@ func (c *cniConfigManager) setupCNIConfFile() error {
 		}
 	}
 
+	err = ensureDirExists(c.cniConfDir)
+	if err != nil {
+		return fmt.Errorf("failed to create the dir %s of the CNI configuration file: %w", c.cniConfDir, err)
+	}
+
 	dest := path.Join(c.cniConfDir, c.cniConfFile)
 
 	// Check to see if existing file is the same; if so, do nothing
@@ -465,3 +470,11 @@ func (c *cniConfigManager) findCNINetwork(wantNetwork string) ([]byte, error) {
 	}
 	return nil, fmt.Errorf("no matching CNI configurations found (will retry)")
 }
+
+func ensureDirExists(dir string) error {
+	err := os.MkdirAll(dir, os.ModePerm)
+	if err != nil && os.IsExist(err) {
+		return nil
+	}
+	return err
+}

install/kubernetes/cilium/templates/cilium-agent/daemonset.yaml

@@ -590,6 +590,12 @@ spec:
               name: cilium-config
               key: clean-cilium-bpf-state
               optional: true
+        - name: WRITE_CNI_CONF_WHEN_READY
+          valueFrom:
+            configMapKeyRef:
+              name: cilium-config
+              key: write-cni-conf-when-ready
+              optional: true
         {{- if .Values.k8sServiceHost }}
         - name: KUBERNETES_SERVICE_HOST
           value: {{ .Values.k8sServiceHost | quote }}