enable setup common name whitelist for tls checking

Signed-off-by: Frank Yang <[email protected]>
AliyunContainerService · Apr 2, 2018 · 2eb6b2a · 2eb6b2a
1 parent 45f33ea
commit 2eb6b2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/client/client.go b/client/client.go
@@ -37,8 +37,8 @@ type TLSConfig struct {
 	CA               string `json:"tlscacert,omitempty"`
 	Cert             string `json:"tlscert,omitempty"`
 	Key              string `json:"tlskey,omitempty"`
-	VerifyRemote     bool
-	ManagerWhiteList string
+	VerifyRemote     bool   `json:"tlsverify"`
+	ManagerWhiteList string `json:"manager-whitelist"`
 }
 
 // NewAPIClient initializes a new API client for the given host

diff --git a/main.go b/main.go
@@ -312,6 +312,9 @@ func getUnknownFlags(flagSet *pflag.FlagSet, fileFlags map[string]interface{}) e
 	var unknownFlags []string
 
 	for k := range fileFlags {
+		if k == "TLS" {
+			continue
+		}
 		f := flagSet.Lookup(k)
 		if f == nil {
 			unknownFlags = append(unknownFlags, k)