MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hide some deprecated fields from 'get' output (#20069) 

also update wording on `subnet license="" api_key=""`
This commit is contained in:
Harshavardhana 2024-07-10 13:16:44 -07:00 committed by GitHub
parent 27538e2d22
commit a8c6465f22
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/config-current.go
View File

@ -101,7 +101,7 @@ func initHelp() {
config.HelpKV{ config.HelpKV{
Key: config.SubnetSubSys, Key: config.SubnetSubSys,
Type: "string", Type: "string",
Description: "register the cluster to MinIO SUBNET", Description: "register Enterprise license for the cluster",
Optional: true, Optional: true,
}, },
config.HelpKV{ config.HelpKV{

2
docs/sts/web-identity.md
View File

@ -31,8 +31,6 @@ MINIO_IDENTITY_OPENID_CLAIM_USERINFO (on|off) Enable fetching claims f
MINIO_IDENTITY_OPENID_KEYCLOAK_REALM (string) Specify Keycloak 'realm' name, only honored if vendor was set to 'keycloak' as value, if no realm is specified 'master' is default MINIO_IDENTITY_OPENID_KEYCLOAK_REALM (string) Specify Keycloak 'realm' name, only honored if vendor was set to 'keycloak' as value, if no realm is specified 'master' is default
MINIO_IDENTITY_OPENID_KEYCLOAK_ADMIN_URL (string) Specify Keycloak 'admin' REST API endpoint e.g. http://localhost:8080/auth/admin/ MINIO_IDENTITY_OPENID_KEYCLOAK_ADMIN_URL (string) Specify Keycloak 'admin' REST API endpoint e.g. http://localhost:8080/auth/admin/
MINIO_IDENTITY_OPENID_REDIRECT_URI_DYNAMIC (on|off) Enable 'Host' header based dynamic redirect URI (default: 'off') MINIO_IDENTITY_OPENID_REDIRECT_URI_DYNAMIC (on|off) Enable 'Host' header based dynamic redirect URI (default: 'off')
MINIO_IDENTITY_OPENID_CLAIM_PREFIX (string) [DEPRECATED use 'claim_name'] JWT claim namespace prefix e.g. "customer1/"
MINIO_IDENTITY_OPENID_REDIRECT_URI (string) [DEPRECATED use env 'MINIO_BROWSER_REDIRECT_URL'] Configure custom redirect_uri for OpenID login flow callback
MINIO_IDENTITY_OPENID_COMMENT (sentence) optionally add a comment to this setting MINIO_IDENTITY_OPENID_COMMENT (sentence) optionally add a comment to this setting
``` ```

10
internal/config/identity/openid/openid.go
View File

@ -101,12 +101,14 @@ var (
Value: "", Value: "",
}, },
config.KV{ config.KV{
Key: ClaimPrefix, Key: ClaimPrefix,
Value: "", Value: "",
HiddenIfEmpty: true,
}, },
config.KV{ config.KV{
Key: RedirectURI, Key: RedirectURI,
Value: "", Value: "",
HiddenIfEmpty: true,
}, },
config.KV{ config.KV{
Key: RedirectURIDynamic, Key: RedirectURIDynamic,

20
internal/config/notify/parse.go
View File

@ -861,20 +861,24 @@ var (
Value: config.EnableOff, Value: config.EnableOff,
}, },
config.KV{ config.KV{
Key: target.NATSStreaming, Key: target.NATSStreaming,
Value: config.EnableOff, Value: config.EnableOff,
HiddenIfEmpty: true,
}, },
config.KV{ config.KV{
Key: target.NATSStreamingAsync, Key: target.NATSStreamingAsync,
Value: config.EnableOff, Value: config.EnableOff,
HiddenIfEmpty: true,
}, },
config.KV{ config.KV{
Key: target.NATSStreamingMaxPubAcksInFlight, Key: target.NATSStreamingMaxPubAcksInFlight,
Value: "0", Value: "0",
HiddenIfEmpty: true,
}, },
config.KV{ config.KV{
Key: target.NATSStreamingClusterID, Key: target.NATSStreamingClusterID,
Value: "", Value: "",
HiddenIfEmpty: true,
}, },
config.KV{ config.KV{
Key: target.NATSQueueDir, Key: target.NATSQueueDir,

10
internal/config/policy/opa/config.go
View File

@ -42,12 +42,14 @@ const (
var ( var (
DefaultKVS = config.KVS{ DefaultKVS = config.KVS{
config.KV{ config.KV{
Key: URL, Key: URL,
Value: "", Value: "",
HiddenIfEmpty: true,
}, },
config.KV{ config.KV{
Key: AuthToken, Key: AuthToken,
Value: "", Value: "",
HiddenIfEmpty: true,
}, },
} }
) )

10
internal/config/subnet/help.go
View File

@ -1,4 +1,4 @@
// Copyright (c) 2015-2021 MinIO, Inc. // Copyright (c) 2015-2024 MinIO, Inc.
// //
// This file is part of MinIO Object Storage stack // This file is part of MinIO Object Storage stack
// //
@ -27,23 +27,23 @@ var (
// HelpSubnet - provides help for subnet api key config // HelpSubnet - provides help for subnet api key config
HelpSubnet = config.HelpKVS{ HelpSubnet = config.HelpKVS{
config.HelpKV{ config.HelpKV{
Key: config.License, // Deprecated Dec 2021 Key: config.License,
Type: "string", Type: "string",
Description: "[DEPRECATED use api_key] Subnet license token for the cluster" + defaultHelpPostfix(config.License), Description: "Enterprise license for the cluster" + defaultHelpPostfix(config.License),
Optional: true, Optional: true,
Sensitive: true, Sensitive: true,
}, },
config.HelpKV{ config.HelpKV{
Key: config.APIKey, Key: config.APIKey,
Type: "string", Type: "string",
Description: "Subnet api key for the cluster" + defaultHelpPostfix(config.APIKey), Description: "Enterprise license API key for the cluster" + defaultHelpPostfix(config.APIKey),
Optional: true, Optional: true,
Sensitive: true, Sensitive: true,
}, },
config.HelpKV{ config.HelpKV{
Key: config.Proxy, Key: config.Proxy,
Type: "string", Type: "string",
Description: "HTTP(S) proxy URL to use for connecting to SUBNET" + defaultHelpPostfix(config.Proxy), Description: "HTTP(s) proxy URL to use for connecting to SUBNET" + defaultHelpPostfix(config.Proxy),
Optional: true, Optional: true,
Sensitive: true, Sensitive: true,
}, },