Skip to content

Commit e3b9541

Browse files
authored
Merge pull request kubernetes#131527 from carlory/cleanup-kubelet-UserNamespaces
Fix incorrect feature gate name UserNamespaceSupport for kubelet apis
2 parents 67d2bef + a56378d commit e3b9541

File tree

2 files changed

+4
-4
lines changed
  • pkg/kubelet/apis/config
  • staging/src/k8s.io/kubelet/config/v1beta1

2 files changed

+4
-4
lines changed

pkg/kubelet/apis/config/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ type KubeletConfiguration struct {
540540
CrashLoopBackOff CrashLoopBackOffConfig
541541

542542
// UserNamespaces contains User Namespace configurations.
543-
// +featureGate=UserNamespaceSupport
543+
// +featureGate=UserNamespacesSupport
544544
// +optional
545545
UserNamespaces *UserNamespaces
546546
}
@@ -893,7 +893,7 @@ type UserNamespaces struct {
893893
// Changing the value may require recreating all containers on the node.
894894
//
895895
// Default: 65536
896-
// +featureGate=UserNamespaceSupport
896+
// +featureGate=UserNamespacesSupport
897897
// +optional
898898
IDsPerPod *int64
899899
}

staging/src/k8s.io/kubelet/config/v1beta1/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ type KubeletConfiguration struct {
923923
FailCgroupV1 *bool `json:"failCgroupV1,omitempty"`
924924

925925
// UserNamespaces contains User Namespace configurations.
926-
// +featureGate=UserNamespaceSupport
926+
// +featureGate=UserNamespacesSupport
927927
// +optional
928928
UserNamespaces *UserNamespaces `json:"userNamespaces,omitempty"`
929929
}
@@ -1131,7 +1131,7 @@ type UserNamespaces struct {
11311131
// Changing the value may require recreating all containers on the node.
11321132
//
11331133
// Default: 65536
1134-
// +featureGate=UserNamespaceSupport
1134+
// +featureGate=UserNamespacesSupport
11351135
// +optional
11361136
IDsPerPod *int64 `json:"idsPerPod,omitempty"`
11371137
}

0 commit comments

Comments
 (0)