Skip to content

Remove constraints and update all vendor pkgs #100

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

Merged
merged 2 commits into from
Mar 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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
178 changes: 98 additions & 80 deletions Gopkg.lock

Large diffs are not rendered by default.

39 changes: 10 additions & 29 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,51 +11,32 @@ required = [

[[constraint]]
name = "github.com/container-storage-interface/spec"
version = "1.0.0-rc2"
version = "=1.0.0" # Set this to exactly 1.0.0 until we can update test code to handle 1.1.0

[[override]]
name = "github.com/golang/protobuf"
version = "v1.1.0"

[[constraint]]
branch = "master"
name = "github.com/golang/glog"

[[constraint]]
name = "github.com/kubernetes-csi/csi-test"
version = "1.0.0-rc2"

[[constraint]]
name = "google.golang.org/grpc"
version = "1.9.2"

# Branches are used for k8s.io constraints because at the
# moment we need latest 1.14 APIs for external-provisioner.
# This can be set to an official 1.14 tag once 1.14 is released.
# The dependency on external-provisioner should be removed with #60.
[[constraint]]
name = "k8s.io/api"
version = "kubernetes-1.13.0-beta.1"
branch = "release-1.14"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.13.0-beta.1"
branch = "release-1.14"

[[constraint]]
name = "k8s.io/client-go"
version = "kubernetes-1.13.0-beta.1"

[[override]]
name = "github.com/json-iterator/go"
version = "1.1.4"
branch = "release-11.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the latest stable branch that supports k8s 1.14?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, the 10.0 release supports k8s 1.13, so the 11.0 is for 1.14.


[[constraint]]
name = "k8s.io/code-generator"
version = "kubernetes-1.13.0-beta.1"
branch = "release-1.14"

[[constraint]]
name = "k8s.io/apiextensions-apiserver"
version = "kubernetes-1.13.0-beta.1"

[[constraint]]
name = "github.com/kubernetes-csi/csi-lib-utils"
version = "0.3.0"
branch = "release-1.14"

[prune]
non-go = true
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/snapshot_controller_base.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
storageinformers "github.com/kubernetes-csi/external-snapshotter/pkg/client/informers/externalversions/volumesnapshot/v1alpha1"
storagelisters "github.com/kubernetes-csi/external-snapshotter/pkg/client/listers/volumesnapshot/v1alpha1"
"github.com/kubernetes-csi/external-snapshotter/pkg/connection"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down Expand Up @@ -89,7 +89,7 @@ func NewCSISnapshotController(
) *csiSnapshotController {
broadcaster := record.NewBroadcaster()
broadcaster.StartLogging(glog.Infof)
broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: client.Core().Events(v1.NamespaceAll)})
broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: client.CoreV1().Events(v1.NamespaceAll)})
var eventRecorder record.EventRecorder
eventRecorder = broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: fmt.Sprintf("csi-snapshotter %s", snapshotterName)})

Expand Down
5 changes: 2 additions & 3 deletions vendor/github.com/gogo/protobuf/LICENSE

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

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

63 changes: 63 additions & 0 deletions vendor/github.com/gogo/protobuf/proto/deprecated.go

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

18 changes: 0 additions & 18 deletions vendor/github.com/gogo/protobuf/proto/encode.go

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

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

100 changes: 73 additions & 27 deletions vendor/github.com/gogo/protobuf/proto/lib.go

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

Loading