Skip to content

Commit

Permalink
Merge pull request kubernetes#116611 from dims/missed-registering-kub…
Browse files Browse the repository at this point in the history
…elet-config-file-for-make-test-e2e-node-usecase

missed registering kubelet-config-file for the command line use case running test-e2e-node target
  • Loading branch information
k8s-ci-robot committed Mar 15, 2023
2 parents 2287225 + ee294de commit 602ba9a
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion test/e2e_node/services/kubelet.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,13 @@ func (a *args) Set(value string) error {

// kubeletArgs is the override kubelet args specified by the test runner.
var kubeletArgs args
var kubeletConfigFile = "./kubeletconfig.yaml"

func init() {
flag.Var(&kubeletArgs, "kubelet-flags", "Kubelet flags passed to kubelet, this will override default kubelet flags in the test. Flags specified in multiple kubelet-flags will be concatenate. Deprecated, see: --kubelet-config-file.")
if flag.Lookup("kubelet-config-file") == nil {
flag.StringVar(&kubeletConfigFile, "kubelet-config-file", kubeletConfigFile, "The base KubeletConfiguration to use when setting up the kubelet. This configuration will then be minimially modified to support requirements from the test suite.")
}
}

// RunKubelet starts kubelet and waits for termination signal. Once receives the
Expand Down Expand Up @@ -181,7 +185,6 @@ func (e *E2EServices) startKubelet(featureGates map[string]bool) (*server, error
return nil, err
}

kubeletConfigFile := "./kubeletconfig.yaml"
lookup := flag.Lookup("kubelet-config-file")
if lookup != nil {
kubeletConfigFile = lookup.Value.String()
Expand Down

0 comments on commit 602ba9a

Please sign in to comment.