Merge pull request #3615 from dmcgowan/fix-proxy-plugin-config

estesp · web-flow · commit 3050b3664006 · 2019-09-04T10:09:24.000-04:00
Fix proxy plugin config validation
diff --git a/services/server/config/config.go b/services/server/config/config.go
@@ -107,11 +107,6 @@ func (c *Config) ValidateV2() error {
 			return errors.Errorf("invalid plugin key URI %q expect io.containerd.x.vx", p)
 		}
 	}
-	for p := range c.ProxyPlugins {
-		if len(strings.Split(p, ".")) < 4 {
-			return errors.Errorf("invalid proxy plugin key URI %q expect io.containerd.x.vx", p)
-		}
-	}
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,6 @@ func (c *Config) ValidateV2() error {`
`107`	`107`	`return errors.Errorf("invalid plugin key URI %q expect io.containerd.x.vx", p)`
`108`	`108`	`}`
`109`	`109`	`}`
`110`		`- for p := range c.ProxyPlugins {`
`111`		`- if len(strings.Split(p, ".")) < 4 {`
`112`		`- return errors.Errorf("invalid proxy plugin key URI %q expect io.containerd.x.vx", p)`
`113`		`- }`
`114`		`- }`
`115`	`110`	`return nil`
`116`	`111`	`}`
`117`	`112`