Merge pull request #68386 from dashpole/fix_alphafeatures

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. Remove feature gate from kubelet defaulting **What this PR does / why we need it**: Fixes a release-blocking test: https://k8s-testgrid.appspot.com/sig-release-1.12-blocking#gce-cos-1.12-alphafeatures Regression added by #63437 This solution was discussed on slack in the sig-release channel This should be targeted for 1.12 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Issue #https://github.com/kubernetes/kubernetes/issues/68313 **Special notes for your reviewer**: /hold testing to make sure this fixes the issue Using: `make test-e2e-node FOCUS=ImageGCNoEviction SKIP= PARALLELISM=1 REMOTE=true TEST_ARGS='--feature-gates=CustomCPUCFSQuotaPeriod=true'` to reproduce the issue, as it runs a test with the feature gate enabled. **Release note**: ```release-note NONE ``` /assign @dims @derekwaynecarr /sig node /kind bug /priority critical-urgent

Merge pull request #68386 from dashpole/fix_alphafeatures
75e53389 · Kubernetes Submit Queue · GitHub · 659092d8 · 137c6d63 · 75e53389
Unverified Commit 75e53389 authored Sep 06, 2018 by Kubernetes Submit Queue Committed by GitHub Sep 06, 2018
Showing with 2 additions and 4 deletions

defaulted.yaml ...app/util/config/testdata/defaulting/master/defaulted.yaml +1 -1

BUILD pkg/kubelet/apis/config/v1beta1/BUILD +0 -1

defaults.go pkg/kubelet/apis/config/v1beta1/defaults.go +1 -2

No files found.
--- a/cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml
+++ b/cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml
@@ -102,7 +102,7 @@ containerLogMaxFiles: 5
 containerLogMaxSize: 10Mi
 contentType: application/vnd.kubernetes.protobuf
 cpuCFSQuota: true
-cpuCFSQuotaPeriod: 0s
+cpuCFSQuotaPeriod: 100ms
 cpuManagerPolicy: none
 cpuManagerReconcilePeriod: 10s
 enableControllerAttachDetach: true

--- a/pkg/kubelet/apis/config/v1beta1/BUILD
+++ b/pkg/kubelet/apis/config/v1beta1/BUILD
@@ -19,7 +19,6 @@ go_library(
    ],
    importpath = "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1",
    deps = [
-        "//pkg/features:go_default_library",
        "//pkg/kubelet/apis/config:go_default_library",
        "//pkg/kubelet/qos:go_default_library",
        "//pkg/kubelet/types:go_default_library",

--- a/pkg/kubelet/apis/config/v1beta1/defaults.go
+++ b/pkg/kubelet/apis/config/v1beta1/defaults.go
@@ -23,7 +23,6 @@ import (
 	kruntime "k8s.io/apimachinery/pkg/runtime"
 	kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
 	// TODO: Cut references to k8s.io/kubernetes, eventually there should be none from this package
-	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/kubelet/qos"
 	kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
 	"k8s.io/kubernetes/pkg/master/ports"
@@ -159,7 +158,7 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
 	if obj.CPUCFSQuota == nil {
 		obj.CPUCFSQuota = utilpointer.BoolPtr(true)
 	}
-	if obj.CPUCFSQuotaPeriod == nil && obj.FeatureGates[string(features.CPUCFSQuotaPeriod)] {
+	if obj.CPUCFSQuotaPeriod == nil {
 		obj.CPUCFSQuotaPeriod = &metav1.Duration{Duration: 100 * time.Millisecond}
 	}
 	if obj.MaxOpenFiles == 0 {