Skip to content

Commit 6af5e45

Browse files
authored
Merge pull request #121 from YangHgRi/yanghgri/refactor/move-consts-package
refactor: move consts package from sidecar to client module
2 parents d904c62 + d59dc70 commit 6af5e45

File tree

7 files changed

+56
-4
lines changed

7 files changed

+56
-4
lines changed
File renamed without changes.

sidecar/pkg/bucket/bucket_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import (
2929
kube "k8s.io/client-go/kubernetes"
3030
"k8s.io/client-go/tools/record"
3131
"k8s.io/klog/v2"
32+
"sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage/consts"
3233
"sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage/v1alpha1"
3334
buckets "sigs.k8s.io/container-object-storage-interface/client/clientset/versioned"
3435
bucketapi "sigs.k8s.io/container-object-storage-interface/client/clientset/versioned/typed/objectstorage/v1alpha1"
3536
cosi "sigs.k8s.io/container-object-storage-interface/proto"
36-
"sigs.k8s.io/container-object-storage-interface/sidecar/pkg/consts"
3737
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3838
)
3939

sidecar/pkg/bucket/bucket_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import (
3131
"k8s.io/apimachinery/pkg/runtime"
3232
fakekubeclientset "k8s.io/client-go/kubernetes/fake"
3333
"k8s.io/client-go/tools/record"
34+
"sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage/consts"
3435
"sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage/v1alpha1"
3536
fakebucketclientset "sigs.k8s.io/container-object-storage-interface/client/clientset/versioned/fake"
3637
cosi "sigs.k8s.io/container-object-storage-interface/proto"
3738
fakespec "sigs.k8s.io/container-object-storage-interface/proto/fake"
38-
"sigs.k8s.io/container-object-storage-interface/sidecar/pkg/consts"
3939
)
4040

4141
func TestInitializeKubeClient(t *testing.T) {

sidecar/pkg/bucketaccess/bucketaccess_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ import (
3333
"k8s.io/client-go/tools/record"
3434
"k8s.io/klog/v2"
3535
cosiapi "sigs.k8s.io/container-object-storage-interface/client/apis"
36+
"sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage/consts"
3637
"sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage/v1alpha1"
3738
buckets "sigs.k8s.io/container-object-storage-interface/client/clientset/versioned"
3839
bucketapi "sigs.k8s.io/container-object-storage-interface/client/clientset/versioned/typed/objectstorage/v1alpha1"
3940
cosi "sigs.k8s.io/container-object-storage-interface/proto"
40-
"sigs.k8s.io/container-object-storage-interface/sidecar/pkg/consts"
4141
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
4242
)
4343

sidecar/pkg/bucketaccess/bucketaccess_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ import (
3232
"k8s.io/apimachinery/pkg/runtime"
3333
fakekubeclientset "k8s.io/client-go/kubernetes/fake"
3434
"k8s.io/client-go/tools/record"
35+
"sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage/consts"
3536
"sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage/v1alpha1"
3637
fakebucketclientset "sigs.k8s.io/container-object-storage-interface/client/clientset/versioned/fake"
3738
cosi "sigs.k8s.io/container-object-storage-interface/proto"
3839
fakespec "sigs.k8s.io/container-object-storage-interface/proto/fake"
39-
"sigs.k8s.io/container-object-storage-interface/sidecar/pkg/consts"
4040
)
4141

4242
func TestInitializeKubeClient(t *testing.T) {

vendor/modules.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,7 @@ k8s.io/utils/trace
794794
## explicit; go 1.23.0
795795
sigs.k8s.io/container-object-storage-interface/client/apis
796796
sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage
797+
sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage/consts
797798
sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage/v1alpha1
798799
sigs.k8s.io/container-object-storage-interface/client/clientset/versioned
799800
sigs.k8s.io/container-object-storage-interface/client/clientset/versioned/fake

vendor/sigs.k8s.io/container-object-storage-interface/client/apis/objectstorage/consts/consts.go

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

0 commit comments

Comments
 (0)