github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 04:52:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #119587 from borg-land/node-env-patch

Browse Source 
Set node-env map parser to nil if an empty string is passed
This commit is contained in:
Kubernetes Prow Robot 2023-07-26 05:26:18 -07:00 committed by GitHub
commit 98358b8ce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/root/Makefile
View File

@ -257,6 +257,8 @@ define TEST_E2E_NODE_HELP_INFO
# SSH_USER: For REMOTE=true only SSH username to use. # SSH_USER: For REMOTE=true only SSH username to use.
# SSH_KEY: For REMOTE=true only. Path to SSH key to use. # SSH_KEY: For REMOTE=true only. Path to SSH key to use.
# SSH_OPTIONS: For REMOTE=true only. SSH options to use. # SSH_OPTIONS: For REMOTE=true only. SSH options to use.
# INSTANCE_TYPE: For REMOTE=true only. Machine type to use.
# NODE_ENV: For REMOTE=true only. Additional metadata keys to add the instance.
# RUNTIME_CONFIG: The runtime configuration for the API server on the node e2e tests. # RUNTIME_CONFIG: The runtime configuration for the API server on the node e2e tests.
# #
# Example: # Example:

3
test/e2e_node/remote/gce/gce_runner.go
View File

@ -58,6 +58,9 @@ func (e *envs) String() string {
// Set function of flag.Value // Set function of flag.Value
func (e *envs) Set(value string) error { func (e *envs) Set(value string) error {
if value == "" {
return nil
}
kv := strings.SplitN(value, "=", 2) kv := strings.SplitN(value, "=", 2)
if len(kv) != 2 { if len(kv) != 2 {
return fmt.Errorf("invalid env string %s", value) return fmt.Errorf("invalid env string %s", value)