Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update go-client to get fix for selflink deprecation #323

Merged
merged 2 commits into from
Aug 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 43 additions & 31 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 19 additions & 7 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,38 @@
name = "github.com/kubernetes-csi/external-snapshotter"
branch = "master"

# TODO: all the k8s.io dependencies are overrides due to
# csi-lib-utils constraints. Once 1.16.0 is released, update
# all of these versions back to a constraint.

# We need a version which does not use glog, because pulling in glog clashes
# with klog.Init. Anything >= 1.12 is fine, but we can't specify that
# because of the lack of semantic versioning in Kubernetes. Therefore we
# have to pick a certain release, otherwise we (more or less randomly) end
# up with something older or master.
[[override]]
name = "k8s.io/api"
branch = "release-1.15"
branch = "master"

[[constraint]]
[[override]]
name = "k8s.io/apimachinery"
branch = "master"

[[override]]
name = "k8s.io/apiserver"
version = "kubernetes-1.14.1"
branch = "master"

[[constraint]]
[[override]]
name = "k8s.io/component-base"
version = "kubernetes-1.14.0"
branch = "master"

[[constraint]]
[[override]]
name = "k8s.io/client-go"
version = "kubernetes-1.14.0"
revision = "dafe3c5e185134720effaffbf3ff320a8afa228e"

[[override]]
name = "k8s.io/utils"
branch = "master"

[[constraint]]
name = "github.com/kubernetes-csi/csi-lib-utils"
Expand Down
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},
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading