Skip to content

Commit

Permalink
Update feature gate dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
msau42 committed Aug 10, 2019
1 parent e215cd1 commit 9d4641f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pkg/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
"k8s.io/client-go/kubernetes"
fakeclientset "k8s.io/client-go/kubernetes/fake"
k8stesting "k8s.io/client-go/testing"
utilfeaturetesting "k8s.io/component-base/featuregate/testing"
"sigs.k8s.io/sig-storage-lib-external-provisioner/controller"
)

Expand Down
13 changes: 8 additions & 5 deletions pkg/features/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,24 @@ limitations under the License.

package features

import utilfeature "k8s.io/apiserver/pkg/util/feature"
import (
"k8s.io/apiserver/pkg/util/feature"
"k8s.io/component-base/featuregate"
)

const (
// owner: @verult
// alpha: v0.4
// beta: v2.0
Topology utilfeature.Feature = "Topology"
Topology featuregate.Feature = "Topology"
)

func init() {
utilfeature.DefaultMutableFeatureGate.Add(defaultKubernetesFeatureGates)
feature.DefaultMutableFeatureGate.Add(defaultKubernetesFeatureGates)
}

// defaultKubernetesFeatureGates consists of all known feature keys specific to external-provisioner.
// To add a new feature, define a key for it above and add it here.
var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureSpec{
Topology: {Default: false, PreRelease: utilfeature.Beta},
var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
Topology: {Default: false, PreRelease: featuregate.Beta},
}

0 comments on commit 9d4641f

Please sign in to comment.