Skip to content

Commit 097b63e

Browse files
committed
Set kubelet read-only-port via CLI flag
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
1 parent 94ba957 commit 097b63e

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

pkg/daemons/agent/agent.go

-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ func defaultKubeletConfig(cfg *daemonconfig.Agent) (*kubeletconfig.KubeletConfig
185185
NodeStatusReportFrequency: metav1.Duration{Duration: time.Minute * 5},
186186
NodeStatusUpdateFrequency: metav1.Duration{Duration: time.Second * 10},
187187
ProtectKernelDefaults: cfg.ProtectKernelDefaults,
188-
ReadOnlyPort: 0,
189188
RuntimeRequestTimeout: metav1.Duration{Duration: time.Minute * 2},
190189
StreamingConnectionIdleTimeout: metav1.Duration{Duration: time.Hour * 4},
191190
SyncFrequency: metav1.Duration{Duration: time.Minute},

pkg/daemons/agent/agent_linux.go

+3
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ func kubeletArgsAndConfig(cfg *config.Agent) (map[string]string, *kubeletconfig.
7777
argsMap := map[string]string{
7878
"config-dir": cfg.KubeletConfigDir,
7979
"kubeconfig": cfg.KubeConfigKubelet,
80+
// note: KubeletConfiguration will omit this field when marshalling if it is set to 0, so we set it via CLI
81+
// https://github.com/k3s-io/k3s/issues/12164
82+
"read-only-port": "0",
8083
}
8184

8285
if cfg.RootDir != "" {

pkg/daemons/agent/agent_windows.go

+3
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ func kubeletArgsAndConfig(cfg *config.Agent) (map[string]string, *kubeletconfig.
5050
argsMap := map[string]string{
5151
"config-dir": cfg.KubeletConfigDir,
5252
"kubeconfig": cfg.KubeConfigKubelet,
53+
// note: KubeletConfiguration will omit this field when marshalling if it is set to 0, so we set it via CLI
54+
// https://github.com/k3s-io/k3s/issues/12164
55+
"read-only-port": "0",
5356
}
5457
if cfg.RootDir != "" {
5558
argsMap["root-dir"] = cfg.RootDir

0 commit comments

Comments
 (0)