Move cloud related feature gates to controller-manager

cici37 · cici37 · commit 33e23c400546 · 2020-10-05T10:19:08.000-07:00
diff --git a/cmd/cloud-controller-manager/app/options/BUILD b/cmd/cloud-controller-manager/app/options/BUILD
@@ -17,7 +17,6 @@ go_library(
         "//cmd/cloud-controller-manager/app/config:go_default_library",
         "//cmd/controller-manager/app/options:go_default_library",
         "//pkg/controller:go_default_library",
-        "//pkg/features:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
@@ -32,6 +31,7 @@ go_library(
         "//staging/src/k8s.io/client-go/tools/record:go_default_library",
         "//staging/src/k8s.io/cloud-provider:go_default_library",
         "//staging/src/k8s.io/component-base/cli/flag:go_default_library",
+        "//staging/src/k8s.io/controller-manager/pkg/features/register:go_default_library",
     ],
 )
 
diff --git a/cmd/cloud-controller-manager/app/options/options.go b/cmd/cloud-controller-manager/app/options/options.go
@@ -43,8 +43,8 @@ import (
 	cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
 	"k8s.io/kubernetes/pkg/controller"
 
-	// add the kubernetes feature gates
-	_ "k8s.io/kubernetes/pkg/features"
+	// add the related feature gates
+	_ "k8s.io/controller-manager/pkg/features/register"
 )
 
 const (
diff --git a/go.mod b/go.mod
@@ -121,6 +121,7 @@ require (
 	k8s.io/cluster-bootstrap v0.0.0
 	k8s.io/code-generator v0.0.0
 	k8s.io/component-base v0.0.0
+	k8s.io/controller-manager v0.0.0
 	k8s.io/cri-api v0.0.0
 	k8s.io/csi-translation-lib v0.0.0
 	k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -426,6 +426,7 @@ staging/src/k8s.io/component-base/cli/flag
 staging/src/k8s.io/component-base/config/v1alpha1
 staging/src/k8s.io/component-base/featuregate
 staging/src/k8s.io/component-base/version/verflag
+staging/src/k8s.io/controller-manager/pkg/features
 staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1
 staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1
 staging/src/k8s.io/kube-aggregator/pkg/apiserver
diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
@@ -1641,8 +1641,16 @@ rules:
       dir: staging/src/k8s.io/controller-manager
     name: master
     dependencies:
+      - repository: api
+        branch: master
       - repository: apimachinery
         branch: master
+      - repository: apiserver
+        branch: master
+      - repository: client-go
+        branch: master
+      - repository: component-base
+        branch: master
   - source:
       branch: release-1.19
       dir: staging/src/k8s.io/controller-manager
diff --git a/staging/src/k8s.io/client-go/go.sum b/staging/src/k8s.io/client-go/go.sum
diff --git a/staging/src/k8s.io/controller-manager/BUILD b/staging/src/k8s.io/controller-manager/BUILD
@@ -24,6 +24,7 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//staging/src/k8s.io/controller-manager/config:all-srcs",
+        "//staging/src/k8s.io/controller-manager/pkg/features:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],
diff --git a/staging/src/k8s.io/controller-manager/go.mod b/staging/src/k8s.io/controller-manager/go.mod
@@ -4,9 +4,17 @@ module k8s.io/controller-manager
 
 go 1.15
 
-require k8s.io/apimachinery v0.0.0
+require (
+	k8s.io/apimachinery v0.0.0
+	k8s.io/apiserver v0.0.0
+	k8s.io/component-base v0.0.0
+)
 
 replace (
+	k8s.io/api => ../api
 	k8s.io/apimachinery => ../apimachinery
+	k8s.io/apiserver => ../apiserver
+	k8s.io/client-go => ../client-go
+	k8s.io/component-base => ../component-base
 	k8s.io/controller-manager => ../controller-manager
 )
diff --git a/staging/src/k8s.io/controller-manager/go.sum b/staging/src/k8s.io/controller-manager/go.sum
diff --git a/staging/src/k8s.io/controller-manager/pkg/features/BUILD b/staging/src/k8s.io/controller-manager/pkg/features/BUILD
@@ -0,0 +1,30 @@
+package(default_visibility = ["//visibility:public"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["kube_features.go"],
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/controller-manager/pkg/features",
+    importpath = "k8s.io/controller-manager/pkg/features",
+    deps = ["//staging/src/k8s.io/component-base/featuregate:go_default_library"],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//staging/src/k8s.io/controller-manager/pkg/features/register:all-srcs",
+    ],
+    tags = ["automanaged"],
+)
diff --git a/staging/src/k8s.io/controller-manager/pkg/features/OWNERS b/staging/src/k8s.io/controller-manager/pkg/features/OWNERS
@@ -0,0 +1,4 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+approvers:
+- feature-approvers
diff --git a/staging/src/k8s.io/controller-manager/pkg/features/kube_features.go b/staging/src/k8s.io/controller-manager/pkg/features/kube_features.go
@@ -0,0 +1,54 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package features
+
+import (
+	"k8s.io/component-base/featuregate"
+)
+
+const (
+	// Every feature gate should add method here following this template:
+	//
+	// // owner: @username
+	// // alpha: v1.4
+	// MyFeature() bool
+
+	// owner @smarterclayton
+	// alpha: v1.16
+	// beta:  v1.19
+	//
+	// Enable legacy behavior to vary cluster functionality on the node-role.kubernetes.io labels. On by default (legacy), will be turned off in 1.18.
+	LegacyNodeRoleBehavior featuregate.Feature = "LegacyNodeRoleBehavior"
+
+	// owner @brendandburns
+	// alpha: v1.9
+	// beta:  v1.19
+	//
+	// Enable nodes to exclude themselves from service load balancers
+	ServiceNodeExclusion featuregate.Feature = "ServiceNodeExclusion"
+)
+
+func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.MutableFeatureGate) error {
+	return featuregates.Add(cloudPublicFeatureGates)
+}
+
+// cloudPublicFeatureGates consists of cloud-specific feature keys.
+// To add a new feature, define a key for it at k8s.io/api/pkg/features and add it here.
+var cloudPublicFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
+	LegacyNodeRoleBehavior: {Default: true, PreRelease: featuregate.Beta},
+	ServiceNodeExclusion:   {Default: true, PreRelease: featuregate.Beta},
+}
diff --git a/staging/src/k8s.io/controller-manager/pkg/features/register/BUILD b/staging/src/k8s.io/controller-manager/pkg/features/register/BUILD
@@ -0,0 +1,31 @@
+package(default_visibility = ["//visibility:public"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["register.go"],
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/controller-manager/pkg/features/register",
+    importpath = "k8s.io/controller-manager/pkg/features/register",
+    deps = [
+        "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
+        "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
+        "//staging/src/k8s.io/controller-manager/pkg/features:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)
diff --git a/staging/src/k8s.io/controller-manager/pkg/features/register/register.go b/staging/src/k8s.io/controller-manager/pkg/features/register/register.go
@@ -0,0 +1,27 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package register
+
+import (
+	"k8s.io/apimachinery/pkg/util/runtime"
+	utilfeature "k8s.io/apiserver/pkg/util/feature"
+	"k8s.io/controller-manager/pkg/features"
+)
+
+func init() {
+	runtime.Must(features.SetupCurrentKubernetesSpecificFeatureGates(utilfeature.DefaultMutableFeatureGate))
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -2176,7 +2176,11 @@ k8s.io/component-base/metrics/testutil
 k8s.io/component-base/term
 k8s.io/component-base/version
 k8s.io/component-base/version/verflag
+# k8s.io/controller-manager v0.0.0 => ./staging/src/k8s.io/controller-manager
+## explicit
 # k8s.io/controller-manager => ./staging/src/k8s.io/controller-manager
+k8s.io/controller-manager/pkg/features
+k8s.io/controller-manager/pkg/features/register
 # k8s.io/cri-api v0.0.0 => ./staging/src/k8s.io/cri-api
 ## explicit
 # k8s.io/cri-api => ./staging/src/k8s.io/cri-api

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ import (`
`43`	`43`	`cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"`
`44`	`44`	`"k8s.io/kubernetes/pkg/controller"`
`45`	`45`
`46`		`- // add the kubernetes feature gates`
`47`		`- _ "k8s.io/kubernetes/pkg/features"`
	`46`	`+ // add the related feature gates`
	`47`	`+ _ "k8s.io/controller-manager/pkg/features/register"`
`48`	`48`	`)`
`49`	`49`
`50`	`50`	`const (`