Skip to content

Commit aae81aa

Browse files
authored
Merge pull request #100 from msau42/update-vendor
Remove constraints and update all vendor pkgs
2 parents 3468ea0 + bb5f13e commit aae81aa

File tree

623 files changed

+86550
-28192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

623 files changed

+86550
-28192
lines changed

Gopkg.lock

Lines changed: 98 additions & 80 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,32 @@ required = [
1111

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

16-
[[override]]
17-
name = "github.com/golang/protobuf"
18-
version = "v1.1.0"
19-
20-
[[constraint]]
21-
branch = "master"
22-
name = "github.com/golang/glog"
23-
24-
[[constraint]]
25-
name = "github.com/kubernetes-csi/csi-test"
26-
version = "1.0.0-rc2"
27-
28-
[[constraint]]
29-
name = "google.golang.org/grpc"
30-
version = "1.9.2"
3116

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

3625
[[constraint]]
3726
name = "k8s.io/apimachinery"
38-
version = "kubernetes-1.13.0-beta.1"
27+
branch = "release-1.14"
3928

4029
[[constraint]]
4130
name = "k8s.io/client-go"
42-
version = "kubernetes-1.13.0-beta.1"
43-
44-
[[override]]
45-
name = "github.com/json-iterator/go"
46-
version = "1.1.4"
31+
branch = "release-11.0"
4732

4833
[[constraint]]
4934
name = "k8s.io/code-generator"
50-
version = "kubernetes-1.13.0-beta.1"
35+
branch = "release-1.14"
5136

5237
[[constraint]]
5338
name = "k8s.io/apiextensions-apiserver"
54-
version = "kubernetes-1.13.0-beta.1"
55-
56-
[[constraint]]
57-
name = "github.com/kubernetes-csi/csi-lib-utils"
58-
version = "0.3.0"
39+
branch = "release-1.14"
5940

6041
[prune]
6142
non-go = true

pkg/controller/snapshot_controller_base.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
storageinformers "github.com/kubernetes-csi/external-snapshotter/pkg/client/informers/externalversions/volumesnapshot/v1alpha1"
2727
storagelisters "github.com/kubernetes-csi/external-snapshotter/pkg/client/listers/volumesnapshot/v1alpha1"
2828
"github.com/kubernetes-csi/external-snapshotter/pkg/connection"
29-
"k8s.io/api/core/v1"
29+
v1 "k8s.io/api/core/v1"
3030
"k8s.io/apimachinery/pkg/api/errors"
3131
"k8s.io/apimachinery/pkg/labels"
3232
"k8s.io/apimachinery/pkg/util/wait"
@@ -89,7 +89,7 @@ func NewCSISnapshotController(
8989
) *csiSnapshotController {
9090
broadcaster := record.NewBroadcaster()
9191
broadcaster.StartLogging(glog.Infof)
92-
broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: client.Core().Events(v1.NamespaceAll)})
92+
broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: client.CoreV1().Events(v1.NamespaceAll)})
9393
var eventRecorder record.EventRecorder
9494
eventRecorder = broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: fmt.Sprintf("csi-snapshotter %s", snapshotterName)})
9595

vendor/github.com/gogo/protobuf/LICENSE

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/gogo/protobuf/proto/decode.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/gogo/protobuf/proto/deprecated.go

Lines changed: 63 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/gogo/protobuf/proto/encode.go

Lines changed: 0 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/gogo/protobuf/proto/extensions.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/gogo/protobuf/proto/lib.go

Lines changed: 73 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)