fix: configuration for bkiam version, issue #567

TencentBlueKing · Oct 27, 2020 · 5989222 · 5989222
1 parent 50d401c
commit 5989222
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/bcs-services/bcs-api/options/options.go b/bcs-services/bcs-api/options/options.go
@@ -101,7 +101,7 @@ type AuthOption struct {
 	RemoteCheck   bool `json:"remote_check" value:"false" usage:"check auth in remote host or not" mapstructure:"remote_check"`
 	SkipNoneToken bool `json:"skip_none_token" value:"false" usage:"skip auth check when token no specified" mapstructure:"skip_none_token"`
 
-	Version string `json:"version" value:"3" usage:"bkiam version, " mapstructure:"version"`
+	Version string `json:"version" value:"3" usage:"bkiam version, 2 or 3." mapstructure:"version"`
 
 	ApiGwRsaFile string `json:"apigw_rsa_file" value:"" usage:"apigw rsa public key file" mapstructure:"apigw_rsa_file"`
 

diff --git a/install/conf/bcs-services/bcs-api/bcs-api.json.template b/install/conf/bcs-services/bcs-api/bcs-api.json.template
@@ -17,6 +17,7 @@
   "local_ip": "${localIp}",
   "bkiam_auth": {
     "auth": false,
+    "version": "${bkiamAuthVersion}",
     "bkiam_auth_host": "${bkiamAuthHost}"
   },
   "bke": {