Skip to content

Commit 92b3e0b

Browse files
committed
Revert "Set kubelet read-only-port via CLI flag"
This reverts commit 097b63e.
1 parent 925726c commit 92b3e0b

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

pkg/daemons/agent/agent.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ 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,
188189
RuntimeRequestTimeout: metav1.Duration{Duration: time.Minute * 2},
189190
StreamingConnectionIdleTimeout: metav1.Duration{Duration: time.Hour * 4},
190191
SyncFrequency: metav1.Duration{Duration: time.Minute},

pkg/daemons/agent/agent_linux.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ 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",
8380
}
8481

8582
if cfg.RootDir != "" {

pkg/daemons/agent/agent_windows.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ 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",
5653
}
5754
if cfg.RootDir != "" {
5855
argsMap["root-dir"] = cfg.RootDir

0 commit comments

Comments
 (0)