Skip to content

Commit 4923b08

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #168 from verult/update-csinodeinfo
Bumping k8s version to 1.13.0-beta.1; Pointing to kubernetes-sigs/sig-storage-lib-external-provisioner instead of external-storage; Update CSINodeInfo schema
2 parents b1112ae + 798b20d commit 4923b08

File tree

2,132 files changed

+220686
-118540
lines changed

Some content is hidden

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

2,132 files changed

+220686
-118540
lines changed

‎Gopkg.lock

+109-71
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,32 @@
3838

3939
[[constraint]]
4040
name = "github.com/kubernetes-csi/external-snapshotter"
41-
version = "1.0.0-rc2"
41+
version = "1.0.0-rc3"
4242

4343
[[constraint]]
44-
name = "github.com/kubernetes-incubator/external-storage"
45-
version = "v5.2.0"
44+
name = "github.com/kubernetes-sigs/sig-storage-lib-external-provisioner"
45+
version = "v2.0.0-alpha"
4646

4747
[[constraint]]
4848
name = "google.golang.org/grpc"
4949
version = "1.9.2"
5050

5151
[[constraint]]
5252
name = "k8s.io/apimachinery"
53-
version = "kubernetes-1.12.0"
53+
version = "kubernetes-1.13.0-beta.1"
5454

5555
[[constraint]]
5656
name = "k8s.io/client-go"
57-
version = "kubernetes-1.12.0"
57+
version = "kubernetes-1.13.0-beta.1"
5858

5959
[[constraint]]
6060
name = "k8s.io/api"
61-
version = "kubernetes-1.12.0"
61+
version = "kubernetes-1.13.0-beta.1"
6262

6363
[[constraint]]
6464
name = "k8s.io/csi-api"
65-
version = "kubernetes-1.12.0"
65+
version = "kubernetes-1.13.0-beta.1"
6666

6767
[[constraint]]
6868
name = "k8s.io/apiserver"
69-
version = "kubernetes-1.12.0"
69+
version = "kubernetes-1.13.0-beta.1"

‎cmd/csi-provisioner/csi-provisioner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
ctrl "github.com/kubernetes-csi/external-provisioner/pkg/controller"
3131
snapclientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
32-
"github.com/kubernetes-incubator/external-storage/lib/controller"
32+
"github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/controller"
3333
csiclientset "k8s.io/csi-api/pkg/client/clientset/versioned"
3434

3535
"google.golang.org/grpc"

‎pkg/controller/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131

3232
"github.com/golang/glog"
3333

34-
"github.com/kubernetes-incubator/external-storage/lib/controller"
34+
"github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/controller"
3535

3636
snapapi "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1alpha1"
3737
snapclientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"

‎pkg/controller/controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/kubernetes-csi/external-provisioner/pkg/features"
3232
crdv1 "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1alpha1"
3333
"github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned/fake"
34-
"github.com/kubernetes-incubator/external-storage/lib/controller"
34+
"github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/controller"
3535
"google.golang.org/grpc"
3636
"k8s.io/api/core/v1"
3737
corev1 "k8s.io/api/core/v1"

‎pkg/controller/topology.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ func sortAndShift(terms []topologyTerm, primary topologyTerm, shiftIndex uint32)
298298
}
299299

300300
func getTopologyKeys(nodeInfo *csiv1alpha1.CSINodeInfo, driverName string) []string {
301-
for _, driver := range nodeInfo.CSIDrivers {
302-
if driver.Driver == driverName {
301+
for _, driver := range nodeInfo.Spec.Drivers {
302+
if driver.Name == driverName {
303303
return driver.TopologyKeys
304304
}
305305
}

‎pkg/controller/topology_test.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -1187,21 +1187,23 @@ func buildNodeInfos(nodeInfos []map[string][]string) *csiv1alpha1.CSINodeInfoLis
11871187
Name: nodeName,
11881188
},
11891189
}
1190+
var csiDrivers []csiv1alpha1.CSIDriverInfoSpec
11901191
for driver, topologyKeys := range nodeInfo {
1191-
driverInfos := []csiv1alpha1.CSIDriverInfo{
1192+
driverInfos := []csiv1alpha1.CSIDriverInfoSpec{
11921193
{
1193-
Driver: driver,
1194+
Name: driver,
11941195
NodeID: nodeName,
11951196
TopologyKeys: topologyKeys,
11961197
},
11971198
{
1198-
Driver: "net.example.storage/other-driver",
1199+
Name: "net.example.storage/other-driver",
11991200
NodeID: nodeName,
12001201
TopologyKeys: []string{"net.example.storage/rack"},
12011202
},
12021203
}
1203-
n.CSIDrivers = append(n.CSIDrivers, driverInfos...)
1204+
csiDrivers = append(csiDrivers, driverInfos...)
12041205
}
1206+
n.Spec = csiv1alpha1.CSINodeInfoSpec{Drivers: csiDrivers}
12051207
list.Items = append(list.Items, n)
12061208
i++
12071209
}

‎vendor/github.com/Sirupsen/logrus/.gitignore

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Sirupsen/logrus/CHANGELOG.md

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Sirupsen/logrus/README.md

+34-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Sirupsen/logrus/alt_exit_test.go

+18-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)