github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1525 from galal-hussein/add_asterisk 

Add asterisks for omitted values in nodeconfig
pull/1453/head^2
Craig Jellick 2020-03-12 14:13:02 -07:00 committed by GitHub
parent 9a21fc513f 356fe006a2
commit 65f7fbe5c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/nodeconfig/nodeconfig.go
View File

@ -16,6 +16,7 @@ const (
NodeArgsAnnotation = "k3s.io/node-args" NodeArgsAnnotation = "k3s.io/node-args"
NodeEnvAnnotation = "k3s.io/node-env" NodeEnvAnnotation = "k3s.io/node-env"
NodeConfigHashAnnotation = "k3s.io/node-config-hash" NodeConfigHashAnnotation = "k3s.io/node-config-hash"
OmittedValue = "********"
) )
func getNodeArgs() (string, error) { func getNodeArgs() (string, error) {
@ -31,7 +32,7 @@ func getNodeArgs() (string, error) {
for i, arg := range nodeArgsList { for i, arg := range nodeArgsList {
if isSecret(arg) { if isSecret(arg) {
if i+1 < len(nodeArgsList) { if i+1 < len(nodeArgsList) {
nodeArgsList[i+1] = "" nodeArgsList[i+1] = OmittedValue
} }
} }
} }
@ -52,7 +53,7 @@ func getNodeEnv() (string, error) {
} }
for key := range k3sEnv { for key := range k3sEnv {
if isSecret(key) { if isSecret(key) {
k3sEnv[key] = "" k3sEnv[key] = OmittedValue
} }
} }
k3sEnvJSON, err := json.Marshal(k3sEnv) k3sEnvJSON, err := json.Marshal(k3sEnv)