From 21608e49a7df17eb9c411ec9057c830cebf65cc2 Mon Sep 17 00:00:00 2001 From: ialidzhikov Date: Thu, 12 Nov 2020 22:40:07 +0200 Subject: [PATCH] Remove WindowsGMSA and WindowsRunAsUserName feature gates Signed-off-by: ialidzhikov --- pkg/features/kube_features.go | 17 ----------------- .../kuberuntime_container_windows.go | 5 +---- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 4a3c0cd1a6b..f7fe6a7ec82 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -435,21 +435,6 @@ const ( // Implement support for limiting pids in nodes SupportNodePidsLimit featuregate.Feature = "SupportNodePidsLimit" - // owner: @wk8 - // alpha: v1.14 - // beta: v1.16 - // - // Enables GMSA support for Windows workloads. - WindowsGMSA featuregate.Feature = "WindowsGMSA" - - // owner: @bclau - // alpha: v1.16 - // beta: v1.17 - // GA: v1.18 - // - // Enables support for running container entrypoints as different usernames than their default ones. - WindowsRunAsUserName featuregate.Feature = "WindowsRunAsUserName" - // owner: @RobertKrawitz // alpha: v1.15 // @@ -747,8 +732,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS ProcMountType: {Default: false, PreRelease: featuregate.Alpha}, TTLAfterFinished: {Default: false, PreRelease: featuregate.Alpha}, KubeletPodResources: {Default: true, PreRelease: featuregate.Beta}, - WindowsGMSA: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.20 - WindowsRunAsUserName: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.20 LocalStorageCapacityIsolationFSQuotaMonitoring: {Default: false, PreRelease: featuregate.Alpha}, NonPreemptingPriority: {Default: true, PreRelease: featuregate.Beta}, PodOverhead: {Default: true, PreRelease: featuregate.Beta}, diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container_windows.go b/pkg/kubelet/kuberuntime/kuberuntime_container_windows.go index 172d2ded604..348423e018d 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container_windows.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container_windows.go @@ -22,9 +22,7 @@ import ( "runtime" "k8s.io/api/core/v1" - utilfeature "k8s.io/apiserver/pkg/util/feature" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - kubefeatures "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/securitycontext" @@ -114,8 +112,7 @@ func (m *kubeGenericRuntimeManager) generateWindowsContainerConfig(container *v1 if username != "" { wc.SecurityContext.RunAsUsername = username } - if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.WindowsGMSA) && - effectiveSc.WindowsOptions != nil && + if effectiveSc.WindowsOptions != nil && effectiveSc.WindowsOptions.GMSACredentialSpec != nil { wc.SecurityContext.CredentialSpec = *effectiveSc.WindowsOptions.GMSACredentialSpec }