Skip to content

K
k3s
Unverified Commit 12c83ff1 authored by Craig Jellick's avatar Craig Jellick Committed by GitHub
Browse files
Options

Merge pull request #1526 from galal-hussein/backport_add_asterisk

[release-1.17] Backport add asterisk
parents fa85cf78 179cb47d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
pkg/nodeconfig/nodeconfig.go
View file @ 12c83ff1
...@@ -16,6 +16,7 @@ const ( ...@@ -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) { ...@@ -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) { ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment