Skip to content

K
k3s
Unverified Commit 6531fb79 authored by Derek Nola's avatar Derek Nola Committed by GitHub
Browse files
Options

Deprecate pod-infra-container-image kubelet flag (#7409)

Signed-off-by: 's avatarDerek Nola <derek.nola@suse.com>
parent 144f5ad3
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
pkg/daemons/agent/agent_linux.go
View file @ 6531fb79
......@@ -112,9 +112,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
argsMap["container-runtime-endpoint"] = socketPrefix + cfg.RuntimeSocket
}
}
if cfg.PauseImage != "" {
argsMap["pod-infra-container-image"] = cfg.PauseImage
}
if cfg.ImageServiceSocket != "" {
if strings.HasPrefix(cfg.ImageServiceSocket, socketPrefix) {
argsMap["image-service-endpoint"] = cfg.ImageServiceSocket
......
pkg/daemons/agent/agent_windows.go
View file @ 6531fb79
......@@ -81,9 +81,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
argsMap["container-runtime-endpoint"] = socketPrefix + cfg.RuntimeSocket
}
}
if cfg.PauseImage != "" {
argsMap["pod-infra-container-image"] = cfg.PauseImage
}
if cfg.ListenAddress != "" {
argsMap["address"] = cfg.ListenAddress
}
......
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