Merge remote-tracking branch 'origin/master' into feature/multus-4.0

2022-04-19 00:14:32 +09:00
parent 13e4b3a1c4 706de7c2c6
commit 10fcc49f4d
11 changed files with 10 additions and 12 deletions
--- a/cmd/multus-daemon/main.go
+++ b/cmd/multus-daemon/main.go
@@ -49,7 +49,6 @@ const (
 	defaultMultusMasterCNIFile          = ""
 	defaultMultusNamespaceIsolation     = false
 	defaultMultusReadinessIndicatorFile = ""
-	defaultMultusRunDir                 = "/host/run/multus-cni/"
 )

 const (
@@ -68,7 +67,6 @@ const (
 	multusMasterCNIFileVarName   = "multus-master-cni-file"
 	multusNamespaceIsolation     = "namespace-isolation"
 	multusReadinessIndicatorFile = "readiness-indicator-file"
-	multusRunDir                 = "multus-rundir"
 )

 func main() {