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

Merge pull request #107096 from hakman/remove_non-masquerade-cidr

Browse Source 
Remove deprecated flag --non-masquerade-cidr in kubelet
This commit is contained in:
Kubernetes Prow Robot
2022-02-08 12:42:50 -08:00
committed by GitHub
parent 24e5d1fdb7 21809043b5
commit 8d01b02c60
5 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet.go
View File

@@ -288,8 +288,7 @@ func PreInitRuntimeService(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
containerRuntime string,
runtimeCgroups string,
remoteRuntimeEndpoint string,
remoteImageEndpoint string,
nonMasqueradeCIDR string) error {
remoteImageEndpoint string) error {
if remoteRuntimeEndpoint != "" {
// remoteImageEndpoint is same as remoteRuntimeEndpoint if not explicitly specified
if remoteImageEndpoint == "" {