Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Commit c357290

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #40 from YiannisGkoufas/fix-imports
imports should change to sigs.k8s.io/container-object-storage-interface-api
2 parents 89e8139 + 80749df commit c357290

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

Diff for: ‎cmd/controller-manager/controller-manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"github.com/spf13/cobra"
1111
"github.com/spf13/viper"
1212

13-
bucketcontroller "github.com/kubernetes-sigs/container-object-storage-interface-api/controller"
1413
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/bucketaccessrequest"
1514
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/bucketrequest"
15+
bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/controller"
1616

1717
"github.com/golang/glog"
1818
)

Diff for: ‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ require (
99
github.com/google/uuid v1.1.2 // indirect
1010
github.com/gopherjs/gopherjs v0.0.0-20190328170749-bb2674552d8f // indirect
1111
github.com/kr/text v0.2.0 // indirect
12-
github.com/kubernetes-sigs/container-object-storage-interface-api v0.0.0-20210120011359-1e91ae41e243
1312
github.com/mailru/easyjson v0.7.6 // indirect
1413
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
1514
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -32,5 +31,6 @@ require (
3231
k8s.io/client-go v0.19.4
3332
k8s.io/klog/v2 v2.4.0 // indirect
3433
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect
34+
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210225042325-7c26b4fc1ed9
3535
sigs.k8s.io/controller-tools v0.4.1
3636
)

Diff for: ‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
303303
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
304304
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
305305
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
306-
github.com/kubernetes-sigs/container-object-storage-interface-api v0.0.0-20210120011359-1e91ae41e243 h1:iOEsQYg/QXxzYP10JaLtoQWdlGG3OS/a3sOYsrDXwdE=
307-
github.com/kubernetes-sigs/container-object-storage-interface-api v0.0.0-20210120011359-1e91ae41e243/go.mod h1:C7tjzC+nLe7H7+3UM/Z6a7F24yxOO8FSK3ZaVZrKDPQ=
308306
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
309307
github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
310308
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -796,6 +794,8 @@ k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
796794
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
797795
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
798796
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0=
797+
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210225042325-7c26b4fc1ed9 h1:ZjGviVPvDVxOhCF7+dsbAk5GPfUpEnM0DtR5yH7S6ww=
798+
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210225042325-7c26b4fc1ed9/go.mod h1:4V9ty4CWneFEQJbr+yQPjkCdUH3EKfjXM4AQXLY4Sa8=
799799
sigs.k8s.io/controller-runtime v0.6.3 h1:SBbr+inLPEKhvlJtrvDcwIpm+uhDvp63Bl72xYJtoOE=
800800
sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY=
801801
sigs.k8s.io/controller-tools v0.4.1 h1:VkuV0MxlRPmRu5iTgBZU4UxUX2LiR99n3sdQGRxZF4w=

Diff for: ‎pkg/bucketaccessrequest/bucketaccessrequest.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
kubeclientset "k8s.io/client-go/kubernetes"
1010
"k8s.io/client-go/util/retry"
1111

12-
"github.com/kubernetes-sigs/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
13-
bucketclientset "github.com/kubernetes-sigs/container-object-storage-interface-api/clientset"
14-
bucketcontroller "github.com/kubernetes-sigs/container-object-storage-interface-api/controller"
1512
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/util"
13+
"sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
14+
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset"
15+
bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/controller"
1616

1717
"github.com/golang/glog"
1818
)

Diff for: ‎pkg/bucketaccessrequest/bucketaccessrequest_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
v1 "k8s.io/api/core/v1"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
99

10-
bucketclientset "github.com/kubernetes-sigs/container-object-storage-interface-api/clientset/fake"
1110
"k8s.io/client-go/kubernetes/fake"
11+
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset/fake"
1212

13-
types "github.com/kubernetes-sigs/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
1413
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/util"
14+
types "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
1515
)
1616

1717
var sa1 = v1.ServiceAccount{

Diff for: ‎pkg/bucketrequest/bucketrequest.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
"k8s.io/client-go/util/retry"
1111

12-
"github.com/kubernetes-sigs/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
13-
bucketclientset "github.com/kubernetes-sigs/container-object-storage-interface-api/clientset"
14-
bucketcontroller "github.com/kubernetes-sigs/container-object-storage-interface-api/controller"
1512
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/util"
1613
kubeclientset "k8s.io/client-go/kubernetes"
14+
"sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
15+
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset"
16+
bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/controller"
1717

1818
"github.com/golang/glog"
1919
)

Diff for: ‎pkg/bucketrequest/bucketrequest_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66

77
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
88

9-
bucketclientset "github.com/kubernetes-sigs/container-object-storage-interface-api/clientset/fake"
109
"k8s.io/client-go/kubernetes/fake"
10+
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset/fake"
1111

12-
types "github.com/kubernetes-sigs/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
1312
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/util"
13+
types "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
1414
)
1515

1616
var classGoldParameters = map[string]string{

Diff for: ‎pkg/util/util.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"k8s.io/client-go/tools/clientcmd"
2323
"k8s.io/client-go/util/workqueue"
2424

25-
types "github.com/kubernetes-sigs/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
26-
bucketclientset "github.com/kubernetes-sigs/container-object-storage-interface-api/clientset"
27-
"github.com/kubernetes-sigs/container-object-storage-interface-api/controller"
25+
types "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
26+
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset"
27+
"sigs.k8s.io/container-object-storage-interface-api/controller"
2828

2929
"sigs.k8s.io/controller-tools/pkg/crd"
3030
crdmarkers "sigs.k8s.io/controller-tools/pkg/crd/markers"
@@ -334,7 +334,7 @@ func RegisterCRDs(ctx context.Context, client apiextensions.CustomResourceDefini
334334
return err
335335
}
336336

337-
roots, err := loader.LoadRoots("github.com/kubernetes-sigs/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1")
337+
roots, err := loader.LoadRoots("sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1")
338338
if err != nil {
339339
return err
340340
}

0 commit comments

Comments
 (0)