Skip to content

Commit d4ee00c

Browse files
authored
Merge pull request kubernetes-csi#133 from leakingtapan/vendor-update
Update vendor to bring in updated CSI translation library
2 parents 927d0e3 + 80ffb2c commit d4ee00c

File tree

298 files changed

+19192
-8086
lines changed

Some content is hidden

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

298 files changed

+19192
-8086
lines changed

Gopkg.lock

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

Gopkg.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,23 @@
2222

2323
[[constraint]]
2424
name = "k8s.io/api"
25-
version = "kubernetes-1.13.2"
25+
version = "kubernetes-1.14.0"
2626

2727
[[constraint]]
2828
name = "k8s.io/csi-translation-lib"
29-
branch = "master"
29+
version = "kubernetes-1.14.0"
3030

3131
[[constraint]]
3232
name = "k8s.io/apimachinery"
33-
version = "kubernetes-1.13.2"
33+
version = "kubernetes-1.14.0"
3434

3535
[[constraint]]
3636
name = "k8s.io/client-go"
37-
version = "kubernetes-1.13.2"
38-
37+
version = "kubernetes-1.14.0"
3938

4039
[[constraint]]
4140
name = "k8s.io/csi-api"
42-
version = "kubernetes-1.13.2"
41+
version = "kubernetes-1.14.0"
4342

4443
[[constraint]]
4544
name = "github.com/kubernetes-csi/csi-lib-utils"

cmd/csi-attacher/leader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func runAsLeader(clientset *kubernetes.Clientset, namespace string, identity str
4949
Identity: identity,
5050
EventRecorder: eventRecorder,
5151
}
52-
lock, err := resourcelock.New(resourcelock.ConfigMapsResourceLock, namespace, controller.SanitizeDriverName(lockName), clientset.CoreV1(), rlConfig)
52+
lock, err := resourcelock.New(resourcelock.ConfigMapsResourceLock, namespace, controller.SanitizeDriverName(lockName), clientset.CoreV1(), clientset.CoordinationV1(), rlConfig)
5353
if err != nil {
5454
klog.Error(err)
5555
os.Exit(1)

pkg/controller/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ type Handler interface {
7272
// NewCSIAttachController returns a new *CSIAttachController
7373
func NewCSIAttachController(client kubernetes.Interface, attacherName string, handler Handler, volumeAttachmentInformer storageinformers.VolumeAttachmentInformer, pvInformer coreinformers.PersistentVolumeInformer) *CSIAttachController {
7474
broadcaster := record.NewBroadcaster()
75-
broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: client.Core().Events(v1.NamespaceAll)})
75+
broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: client.CoreV1().Events(v1.NamespaceAll)})
7676
var eventRecorder record.EventRecorder
7777
eventRecorder = broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: fmt.Sprintf("csi-attacher %s", attacherName)})
7878

pkg/controller/csi_handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ func TestCSIHandler(t *testing.T) {
624624
},
625625
expectedCSICalls: []csiCall{
626626
{"attach", "projects/UNSPECIFIED/zones/testZone/disks/testpd", testNodeID,
627-
map[string]string{"partition": "0"}, noSecrets, readWrite, success, notDetached, noMetadata, 0},
627+
map[string]string{"partition": ""}, noSecrets, readWrite, success, notDetached, noMetadata, 0},
628628
},
629629
},
630630
//

0 commit comments

Comments
 (0)