diff --git a/controller/go.mod b/controller/go.mod index baa6a2e0..3d8f1818 100644 --- a/controller/go.mod +++ b/controller/go.mod @@ -2,11 +2,10 @@ module sigs.k8s.io/container-object-storage-interface-api/controller go 1.22.5 -replace sigs.k8s.io/container-object-storage-interface-api/client => ../client - -replace sigs.k8s.io/container-object-storage-interface-api/client/clientset/versioned => ../client/versioned - -replace sigs.k8s.io/container-object-storage-interface-api/internal => ../internal +replace ( + sigs.k8s.io/container-object-storage-interface-api/client => ../client + sigs.k8s.io/container-object-storage-interface-api/internal => ../internal +) require ( github.com/spf13/cobra v1.8.1 diff --git a/pkg/imported-sidecar/Dockerfile b/sidecar/Dockerfile similarity index 62% rename from pkg/imported-sidecar/Dockerfile rename to sidecar/Dockerfile index 04934a14..dac57552 100644 --- a/pkg/imported-sidecar/Dockerfile +++ b/sidecar/Dockerfile @@ -1,18 +1,26 @@ +# NOTE: context is expected to be repo root, not sidecar/ dir + # # BUILDER # -FROM docker.io/library/golang:1.22.3 AS builder +FROM docker.io/library/golang:1.22.5 AS builder WORKDIR /buildroot # Cache deps before building and copying source, so that we don't need to re-download # as much and so that source changes don't invalidate our downloaded layer. -COPY go.mod go.mod -COPY go.sum go.sum +COPY client/ client/ +COPY internal/ internal/ +COPY proto/ proto/ +COPY sidecar/go.mod sidecar/go.mod +COPY sidecar/go.sum sidecar/go.sum + +WORKDIR /buildroot/sidecar + RUN go mod download -COPY cmd/ cmd/ -COPY pkg/ pkg/ +COPY sidecar/cmd/ cmd/ +COPY sidecar/pkg/ pkg/ ENV CGO_ENABLED=0 @@ -29,8 +37,8 @@ LABEL description="COSI Storage Sidecar" LABEL org.opencontainers.image.title="COSI Storage Sidecar" LABEL org.opencontainers.image.description="Container Object Storage Interface (COSI) Storage Provisioner Sidecar" -LABEL org.opencontainers.image.source="https://github.com/kubernetes-sigs/container-object-storage-interface-provisioner-sidecar" +LABEL org.opencontainers.image.source="https://github.com/kubernetes-sigs/container-object-storage-interface-provisioner-api/sidecar" LABEL org.opencontainers.image.licenses="APACHE-2.0" -COPY --from=builder /buildroot/artifacts/objectstorage-sidecar . +COPY --from=builder /buildroot/sidecar/artifacts/objectstorage-sidecar . ENTRYPOINT ["/objectstorage-sidecar"] diff --git a/pkg/imported-sidecar/Makefile b/sidecar/Makefile similarity index 81% rename from pkg/imported-sidecar/Makefile rename to sidecar/Makefile index 736f6844..52540807 100644 --- a/pkg/imported-sidecar/Makefile +++ b/sidecar/Makefile @@ -1,5 +1,6 @@ .DEFAULT_GOAL := help SHELL = /usr/bin/env bash +THIS_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) # 'go env' vars aren't always available in make environments, so get defaults for needed ones GOARCH ?= $(shell go env GOARCH) @@ -22,7 +23,7 @@ IMAGE_TAG ?= cosi-provisioner-sidecar:latest .PHONY: build ## Build local image for development, defaulting linux/ build: - $(DOCKER) build --platform $(PLATFORM) --tag $(IMAGE_TAG) . + cd .. && $(DOCKER) build --file $(THIS_DIR)/Dockerfile --platform $(PLATFORM) --tag $(IMAGE_TAG) . .PHONY: test ## Test packages diff --git a/pkg/imported-sidecar/cloudbuild.yaml b/sidecar/cloudbuild.yaml similarity index 100% rename from pkg/imported-sidecar/cloudbuild.yaml rename to sidecar/cloudbuild.yaml diff --git a/pkg/imported-sidecar/cmd/objectstorage-sidecar/cmd.go b/sidecar/cmd/objectstorage-sidecar/cmd.go similarity index 85% rename from pkg/imported-sidecar/cmd/objectstorage-sidecar/cmd.go rename to sidecar/cmd/objectstorage-sidecar/cmd.go index ce678456..9769923b 100644 --- a/pkg/imported-sidecar/cmd/objectstorage-sidecar/cmd.go +++ b/sidecar/cmd/objectstorage-sidecar/cmd.go @@ -20,17 +20,15 @@ import ( "flag" "strings" - "sigs.k8s.io/container-object-storage-interface-api/controller" - "sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/bucket" - "sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/bucketaccess" - "sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/provisioner" - cosi "sigs.k8s.io/container-object-storage-interface-spec" - "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" - "k8s.io/klog/v2" + "sigs.k8s.io/container-object-storage-interface-api/internal/runtime" + cosi "sigs.k8s.io/container-object-storage-interface-api/proto" + "sigs.k8s.io/container-object-storage-interface-api/sidecar/pkg/bucket" + "sigs.k8s.io/container-object-storage-interface-api/sidecar/pkg/bucketaccess" + "sigs.k8s.io/container-object-storage-interface-api/sidecar/pkg/provisioner" ) var ( @@ -90,7 +88,7 @@ func run(ctx context.Context, args []string) error { } klog.V(3).InfoS("Successfully connected to driver", "name", info.Name) - ctrl, err := controller.NewDefaultObjectStorageController("cosi", info.Name, 40) + ctrl, err := runtime.NewDefaultObjectStorageController("cosi", info.Name, 40) if err != nil { return err } diff --git a/pkg/imported-sidecar/cmd/objectstorage-sidecar/main.go b/sidecar/cmd/objectstorage-sidecar/main.go similarity index 100% rename from pkg/imported-sidecar/cmd/objectstorage-sidecar/main.go rename to sidecar/cmd/objectstorage-sidecar/main.go diff --git a/sidecar/go.mod b/sidecar/go.mod new file mode 100644 index 00000000..4197e113 --- /dev/null +++ b/sidecar/go.mod @@ -0,0 +1,81 @@ +module sigs.k8s.io/container-object-storage-interface-api/sidecar + +go 1.22.5 + +replace ( + sigs.k8s.io/container-object-storage-interface-api/client => ../client + sigs.k8s.io/container-object-storage-interface-api/internal => ../internal + sigs.k8s.io/container-object-storage-interface-api/proto => ../proto +) + +require ( + github.com/pkg/errors v0.9.1 + github.com/spf13/cobra v1.8.1 + github.com/spf13/pflag v1.0.5 + github.com/spf13/viper v1.19.0 + google.golang.org/grpc v1.65.0 + k8s.io/api v0.30.3 + k8s.io/apimachinery v0.30.3 + k8s.io/client-go v0.30.3 + k8s.io/klog/v2 v2.130.1 + sigs.k8s.io/container-object-storage-interface-api/client v0.0.0-00010101000000-000000000000 + sigs.k8s.io/container-object-storage-interface-api/internal v0.0.0-00010101000000-000000000000 + sigs.k8s.io/container-object-storage-interface-api/proto v0.0.0-00010101000000-000000000000 + sigs.k8s.io/controller-runtime v0.18.4 +) + +require ( + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/swag v0.22.3 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/imdario/mergo v0.3.6 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cast v1.6.0 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/oauth2 v0.20.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/term v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + golang.org/x/time v0.5.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect + k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect +) diff --git a/sidecar/go.sum b/sidecar/go.sum new file mode 100644 index 00000000..4460d29d --- /dev/null +++ b/sidecar/go.sum @@ -0,0 +1,209 @@ +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= +github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= +github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= +github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= +github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= +github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= +github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= +github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= +github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= +github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= +golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo= +golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ= +k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04= +k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws= +k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4= +k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc= +k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k= +k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= +sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/imported-sidecar/pkg/bucket/bucket_controller.go b/sidecar/pkg/bucket/bucket_controller.go similarity index 91% rename from pkg/imported-sidecar/pkg/bucket/bucket_controller.go rename to sidecar/pkg/bucket/bucket_controller.go index 9b0d672c..bb062e1e 100644 --- a/pkg/imported-sidecar/pkg/bucket/bucket_controller.go +++ b/sidecar/pkg/bucket/bucket_controller.go @@ -29,12 +29,11 @@ import ( kube "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/record" "k8s.io/klog/v2" - "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage/v1alpha1" + "sigs.k8s.io/container-object-storage-interface-api/client/apis/objectstorage/v1alpha1" buckets "sigs.k8s.io/container-object-storage-interface-api/client/clientset/versioned" bucketapi "sigs.k8s.io/container-object-storage-interface-api/client/clientset/versioned/typed/objectstorage/v1alpha1" - "sigs.k8s.io/container-object-storage-interface-api/controller/events" - "sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/consts" - cosi "sigs.k8s.io/container-object-storage-interface-spec" + cosi "sigs.k8s.io/container-object-storage-interface-api/proto" + "sigs.k8s.io/container-object-storage-interface-api/sidecar/pkg/consts" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) @@ -73,7 +72,7 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket) "name", bucket.ObjectMeta.Name) if bucket.Spec.BucketClassName == "" { - return b.recordError(inputBucket, v1.EventTypeWarning, events.FailedCreateBucket, fmt.Errorf("%w for Bucket %v", consts.ErrUndefinedBucketClassName, bucket.Name)) + return b.recordError(inputBucket, v1.EventTypeWarning, v1alpha1.FailedCreateBucket, fmt.Errorf("%w for Bucket %v", consts.ErrUndefinedBucketClassName, bucket.Name)) } if !strings.EqualFold(bucket.Spec.DriverName, b.driverName) { @@ -102,12 +101,12 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket) if bucket.Spec.Parameters == nil { bucketClass, err := b.bucketClasses().Get(ctx, bucket.Spec.BucketClassName, metav1.GetOptions{}) if kubeerrors.IsNotFound(err) { - return b.recordError(inputBucket, v1.EventTypeWarning, events.FailedCreateBucket, err) + return b.recordError(inputBucket, v1.EventTypeWarning, v1alpha1.FailedCreateBucket, err) } else if err != nil { klog.V(3).ErrorS(err, "Error fetching bucketClass", "bucketClass", bucket.Spec.BucketClassName, "bucket", bucket.ObjectMeta.Name) - return b.recordError(inputBucket, v1.EventTypeWarning, events.FailedCreateBucket, err) + return b.recordError(inputBucket, v1.EventTypeWarning, v1alpha1.FailedCreateBucket, err) } if bucketClass.Parameters != nil { @@ -128,7 +127,7 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket) rsp, err := b.provisionerClient.DriverCreateBucket(ctx, req) if err != nil { if status.Code(err) != codes.AlreadyExists { - return b.recordError(inputBucket, v1.EventTypeWarning, events.FailedCreateBucket, fmt.Errorf("failed to create bucket: %w", err)) + return b.recordError(inputBucket, v1.EventTypeWarning, v1alpha1.FailedCreateBucket, fmt.Errorf("failed to create bucket: %w", err)) } } @@ -156,7 +155,7 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket) klog.V(3).ErrorS(err, "Failed to get bucketClaim", "bucketClaim", ref.Name, "bucket", bucket.ObjectMeta.Name) - return b.recordError(bucket, v1.EventTypeWarning, events.FailedCreateBucket, err) + return b.recordError(bucket, v1.EventTypeWarning, v1alpha1.FailedCreateBucket, err) } bucketClaim.Status.BucketReady = true @@ -164,7 +163,7 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket) klog.V(3).ErrorS(err, "Failed to update bucketClaim", "bucketClaim", ref.Name, "bucket", bucket.ObjectMeta.Name) - return b.recordError(bucket, v1.EventTypeWarning, events.FailedCreateBucket, err) + return b.recordError(bucket, v1.EventTypeWarning, v1alpha1.FailedCreateBucket, err) } klog.V(5).Infof("Successfully updated status of bucketClaim: %s, bucket: %s", bucketClaim.ObjectMeta.Name, bucket.ObjectMeta.Name) @@ -174,7 +173,7 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket) controllerutil.AddFinalizer(bucket, consts.BucketFinalizer) if bucket, err = b.buckets().Update(ctx, bucket, metav1.UpdateOptions{}); err != nil { klog.V(3).ErrorS(err, "Failed to update bucket finalizers", "bucket", bucket.ObjectMeta.Name) - return b.recordError(bucket, v1.EventTypeWarning, events.FailedCreateBucket, + return b.recordError(bucket, v1.EventTypeWarning, v1alpha1.FailedCreateBucket, fmt.Errorf("failed to update bucket finalizers: %w", err)) } @@ -188,7 +187,7 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket) if _, err = b.buckets().UpdateStatus(ctx, bucket, metav1.UpdateOptions{}); err != nil { klog.V(3).ErrorS(err, "Failed to update bucket status", "bucket", bucket.ObjectMeta.Name) - return b.recordError(bucket, v1.EventTypeWarning, events.FailedCreateBucket, + return b.recordError(bucket, v1.EventTypeWarning, v1alpha1.FailedCreateBucket, fmt.Errorf("failed to update bucket status: %w", err)) } @@ -244,7 +243,7 @@ func (b *BucketListener) Update(ctx context.Context, old, new *v1alpha1.Bucket) if controllerutil.ContainsFinalizer(bucket, consts.BucketFinalizer) { err = b.deleteBucketOp(ctx, bucket) if err != nil { - return b.recordError(bucket, v1.EventTypeWarning, events.FailedDeleteBucket, err) + return b.recordError(bucket, v1.EventTypeWarning, v1alpha1.FailedDeleteBucket, err) } controllerutil.RemoveFinalizer(bucket, consts.BucketFinalizer) diff --git a/pkg/imported-sidecar/pkg/bucket/bucket_controller_test.go b/sidecar/pkg/bucket/bucket_controller_test.go similarity index 94% rename from pkg/imported-sidecar/pkg/bucket/bucket_controller_test.go rename to sidecar/pkg/bucket/bucket_controller_test.go index 055a47ff..34a24526 100644 --- a/pkg/imported-sidecar/pkg/bucket/bucket_controller_test.go +++ b/sidecar/pkg/bucket/bucket_controller_test.go @@ -31,12 +31,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" fakekubeclientset "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/record" - "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage/v1alpha1" + "sigs.k8s.io/container-object-storage-interface-api/client/apis/objectstorage/v1alpha1" fakebucketclientset "sigs.k8s.io/container-object-storage-interface-api/client/clientset/versioned/fake" - "sigs.k8s.io/container-object-storage-interface-api/controller/events" - "sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/consts" - cosi "sigs.k8s.io/container-object-storage-interface-spec" - fakespec "sigs.k8s.io/container-object-storage-interface-spec/fake" + cosi "sigs.k8s.io/container-object-storage-interface-api/proto" + fakespec "sigs.k8s.io/container-object-storage-interface-api/proto/fake" + "sigs.k8s.io/container-object-storage-interface-api/sidecar/pkg/consts" ) func TestInitializeKubeClient(t *testing.T) { @@ -174,7 +173,7 @@ func TestRecordEvents(t *testing.T) { name: "BucketClassNameNotDefined", expectedEvent: newEvent( v1.EventTypeWarning, - events.FailedCreateBucket, + v1alpha1.FailedCreateBucket, "BucketClassName not defined for Bucket bucket"), eventTrigger: func(t *testing.T, bl *BucketListener) { if err := bl.Add(context.TODO(), bucket.DeepCopy()); !errors.Is(err, consts.ErrUndefinedBucketClassName) { @@ -197,7 +196,7 @@ func TestRecordEvents(t *testing.T) { name: "BucketClassNotFound", expectedEvent: newEvent( v1.EventTypeWarning, - events.FailedCreateBucket, + v1alpha1.FailedCreateBucket, "bucketclasses.objectstorage.k8s.io \"bucket-class\" not found"), eventTrigger: func(t *testing.T, bl *BucketListener) { bucket := bucket.DeepCopy() @@ -224,7 +223,7 @@ func TestRecordEvents(t *testing.T) { name: "CreateInternalError", expectedEvent: newEvent( v1.EventTypeWarning, - events.FailedCreateBucket, + v1alpha1.FailedCreateBucket, "failed to create bucket: rpc error: code = Internal desc = internal error test"), cosiObjects: []runtime.Object{bucketClass}, eventTrigger: func(t *testing.T, bl *BucketListener) { @@ -251,7 +250,7 @@ func TestRecordEvents(t *testing.T) { name: "DeleteInternalError", expectedEvent: newEvent( v1.EventTypeWarning, - events.FailedDeleteBucket, + v1alpha1.FailedDeleteBucket, "failed to delete bucket: rpc error: code = Internal desc = internal error test"), cosiObjects: []runtime.Object{bucketClaim}, eventTrigger: func(t *testing.T, bl *BucketListener) { diff --git a/pkg/imported-sidecar/pkg/bucketaccess/bucketaccess_controller.go b/sidecar/pkg/bucketaccess/bucketaccess_controller.go similarity index 92% rename from pkg/imported-sidecar/pkg/bucketaccess/bucketaccess_controller.go rename to sidecar/pkg/bucketaccess/bucketaccess_controller.go index c441b6b3..4eb9e5b8 100644 --- a/pkg/imported-sidecar/pkg/bucketaccess/bucketaccess_controller.go +++ b/sidecar/pkg/bucketaccess/bucketaccess_controller.go @@ -32,13 +32,12 @@ import ( kubecorev1 "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/record" "k8s.io/klog/v2" - cosiapi "sigs.k8s.io/container-object-storage-interface-api/apis" - "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage/v1alpha1" + cosiapi "sigs.k8s.io/container-object-storage-interface-api/client/apis" + "sigs.k8s.io/container-object-storage-interface-api/client/apis/objectstorage/v1alpha1" buckets "sigs.k8s.io/container-object-storage-interface-api/client/clientset/versioned" bucketapi "sigs.k8s.io/container-object-storage-interface-api/client/clientset/versioned/typed/objectstorage/v1alpha1" - "sigs.k8s.io/container-object-storage-interface-api/controller/events" - "sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/consts" - cosi "sigs.k8s.io/container-object-storage-interface-spec" + cosi "sigs.k8s.io/container-object-storage-interface-api/proto" + "sigs.k8s.io/container-object-storage-interface-api/sidecar/pkg/consts" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) @@ -93,10 +92,10 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a bucketAccessClass, err := bal.bucketAccessClasses().Get(ctx, bucketAccessClassName, metav1.GetOptions{}) if kubeerrors.IsNotFound(err) { - return bal.recordError(bucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, err) + return bal.recordError(bucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, err) } else if err != nil { klog.ErrorS(err, "Failed to fetch bucketAccessClass", "bucketAccessClass", bucketAccessClassName) - return bal.recordError(bucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, + return bal.recordError(bucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, fmt.Errorf("failed to fetch BucketAccessClass: %w", err)) } @@ -122,7 +121,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a "bucketClaim", bucketClaim.Name, "bucketAccess", bucketAccess.ObjectMeta.Name, ) - return bal.recordError(bucketAccess, v1.EventTypeWarning, events.WaitingForBucket, + return bal.recordError(bucketAccess, v1.EventTypeWarning, v1alpha1.WaitingForBucket, fmt.Errorf("invalid bucket state: %w", err)) } @@ -135,7 +134,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a if authType == cosi.AuthenticationType_IAM && bucketAccess.Spec.ServiceAccountName == "" { err = consts.ErrUndefinedServiceAccountName - return bal.recordError(bucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, err) + return bal.recordError(bucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, err) } if bucketAccess.Status.AccessGranted == true { @@ -149,7 +148,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a bucket, err := bal.buckets().Get(ctx, bucketClaim.Status.BucketName, metav1.GetOptions{}) if err != nil { klog.V(3).ErrorS(err, "Failed to fetch bucket", "bucket", bucketClaim.Status.BucketName) - return bal.recordError(bucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, + return bal.recordError(bucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, fmt.Errorf("failed to fetch bucket: %w", err)) } @@ -158,7 +157,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a consts.ErrInvalidBucketState, bucket.Status.BucketReady, bucket.Status.BucketID == "") - return bal.recordError(bucketAccess, v1.EventTypeWarning, events.WaitingForBucket, err) + return bal.recordError(bucketAccess, v1.EventTypeWarning, v1alpha1.WaitingForBucket, err) } accountName := consts.AccountNamePrefix + string(bucketAccess.UID) @@ -174,7 +173,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a rsp, err := bal.provisionerClient.DriverGrantBucketAccess(ctx, req) if err != nil { if status.Code(err) != codes.AlreadyExists { - return bal.recordError(inputBucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, + return bal.recordError(inputBucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, fmt.Errorf("failed to grant bucket access: %w", err)) } } @@ -182,7 +181,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a if rsp.AccountId == "" { err = consts.ErrUndefinedAccountID klog.V(3).ErrorS(err, "BucketAccess", bucketAccess.ObjectMeta.Name) - return bal.recordError(inputBucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, + return bal.recordError(inputBucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, fmt.Errorf("BucketAccess %s: %w", bucketAccess.ObjectMeta.Name, err)) } @@ -190,7 +189,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a if len(credentials) != 1 { err = consts.ErrInvalidCredentials klog.V(3).ErrorS(err, "BucketAccess", bucketAccess.ObjectMeta.Name) - return bal.recordError(inputBucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, + return bal.recordError(inputBucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, fmt.Errorf("BucketAccess %s: %w", bucketAccess.ObjectMeta.Name, err)) } @@ -233,7 +232,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a stringData, err := json.Marshal(bucketInfo) if err != nil { - return bal.recordError(inputBucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, consts.ErrBucketInfoConversionFailed) + return bal.recordError(inputBucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, consts.ErrBucketInfoConversionFailed) } if _, err := bal.secrets(namespace).Get(ctx, secretCredName, metav1.GetOptions{}); err != nil { @@ -242,7 +241,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a "Failed to create secrets", "bucketAccess", bucketAccess.ObjectMeta.Name, "bucket", bucket.ObjectMeta.Name) - return bal.recordError(inputBucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, + return bal.recordError(inputBucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, fmt.Errorf("failed to fetch secrets: %w", err)) } @@ -262,7 +261,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a "Failed to create minted secret", "bucketAccess", bucketAccess.ObjectMeta.Name, "bucket", bucket.ObjectMeta.Name) - return bal.recordError(inputBucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, + return bal.recordError(inputBucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, fmt.Errorf("failed to create minted secret: %w", err)) } } @@ -271,7 +270,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a if controllerutil.AddFinalizer(bucket, consts.BABucketFinalizer) { _, err = bal.buckets().Update(ctx, bucket, metav1.UpdateOptions{}) if err != nil { - return bal.recordError(inputBucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, err) + return bal.recordError(inputBucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, err) } } @@ -281,7 +280,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a klog.V(3).ErrorS(err, "Failed to update BucketAccess finalizer", "bucketAccess", bucketAccess.ObjectMeta.Name, "bucket", bucket.ObjectMeta.Name) - return bal.recordError(inputBucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, + return bal.recordError(inputBucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, fmt.Errorf("failed to update finalizer on BucketAccess %s: %w", bucketAccess.ObjectMeta.Name, err)) } } @@ -294,7 +293,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a klog.V(3).ErrorS(err, "Failed to update BucketAccess Status", "bucketAccess", bucketAccess.ObjectMeta.Name, "bucket", bucket.ObjectMeta.Name) - return bal.recordError(inputBucketAccess, v1.EventTypeWarning, events.FailedGrantAccess, + return bal.recordError(inputBucketAccess, v1.EventTypeWarning, v1alpha1.FailedGrantAccess, fmt.Errorf("failed to update Status on BucketAccess %s: %w", bucketAccess.ObjectMeta.Name, err)) } @@ -313,7 +312,7 @@ func (bal *BucketAccessListener) Update(ctx context.Context, old, new *v1alpha1. if !bucketAccess.GetDeletionTimestamp().IsZero() { err := bal.deleteBucketAccessOp(ctx, bucketAccess) if err != nil { - return bal.recordError(bucketAccess, v1.EventTypeWarning, events.FailedRevokeAccess, err) + return bal.recordError(bucketAccess, v1.EventTypeWarning, v1alpha1.FailedRevokeAccess, err) } } diff --git a/pkg/imported-sidecar/pkg/bucketaccess/bucketaccess_controller_test.go b/sidecar/pkg/bucketaccess/bucketaccess_controller_test.go similarity index 96% rename from pkg/imported-sidecar/pkg/bucketaccess/bucketaccess_controller_test.go rename to sidecar/pkg/bucketaccess/bucketaccess_controller_test.go index 3f07ae71..1bbe6a7b 100644 --- a/pkg/imported-sidecar/pkg/bucketaccess/bucketaccess_controller_test.go +++ b/sidecar/pkg/bucketaccess/bucketaccess_controller_test.go @@ -32,12 +32,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" fakekubeclientset "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/record" - "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage/v1alpha1" + "sigs.k8s.io/container-object-storage-interface-api/client/apis/objectstorage/v1alpha1" fakebucketclientset "sigs.k8s.io/container-object-storage-interface-api/client/clientset/versioned/fake" - "sigs.k8s.io/container-object-storage-interface-api/controller/events" - "sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/consts" - cosi "sigs.k8s.io/container-object-storage-interface-spec" - fakespec "sigs.k8s.io/container-object-storage-interface-spec/fake" + cosi "sigs.k8s.io/container-object-storage-interface-api/proto" + fakespec "sigs.k8s.io/container-object-storage-interface-api/proto/fake" + "sigs.k8s.io/container-object-storage-interface-api/sidecar/pkg/consts" ) func TestInitializeKubeClient(t *testing.T) { @@ -338,7 +337,7 @@ func TestRecordEvents(t *testing.T) { name: "BucketAccessClassNotFound", expectedEvent: newEvent( v1.EventTypeWarning, - events.FailedGrantAccess, + v1alpha1.FailedGrantAccess, "bucketaccessclasses.objectstorage.k8s.io \"bucket-access-class\" not found"), eventTrigger: func(t *testing.T, bal *BucketAccessListener) { bucketAccess := bucketAccess.DeepCopy() @@ -363,7 +362,7 @@ func TestRecordEvents(t *testing.T) { name: "UndefinedServiceAccountName", expectedEvent: newEvent( v1.EventTypeWarning, - events.FailedGrantAccess, + v1alpha1.FailedGrantAccess, consts.ErrUndefinedServiceAccountName.Error()), cosiObjects: []runtime.Object{bucketAccessClass, bucketClaim}, eventTrigger: func(t *testing.T, bal *BucketAccessListener) { @@ -389,7 +388,7 @@ func TestRecordEvents(t *testing.T) { name: "InvalidBucketState", expectedEvent: newEvent( v1.EventTypeWarning, - events.WaitingForBucket, + v1alpha1.WaitingForBucket, "BucketAccess can't be granted to Bucket not in Ready state: (isReady? false), (ID empty? true)"), cosiObjects: []runtime.Object{bucketAccessClass, bucketClaim, bucket}, eventTrigger: func(t *testing.T, bal *BucketAccessListener) { @@ -416,7 +415,7 @@ func TestRecordEvents(t *testing.T) { name: "GrantInternalError", expectedEvent: newEvent( v1.EventTypeWarning, - events.FailedGrantAccess, + v1alpha1.FailedGrantAccess, "failed to grant bucket access: rpc error: code = Internal desc = internal error test"), cosiObjects: []runtime.Object{bucketAccessClass, bucketClaim, bucketReady}, eventTrigger: func(t *testing.T, bal *BucketAccessListener) { @@ -443,7 +442,7 @@ func TestRecordEvents(t *testing.T) { name: "RevokeInternalError", expectedEvent: newEvent( v1.EventTypeWarning, - events.FailedRevokeAccess, + v1alpha1.FailedRevokeAccess, "failed to revoke access: rpc error: code = Internal desc = internal error test"), cosiObjects: []runtime.Object{bucketAccessClass, bucketClaim, bucketReady}, eventTrigger: func(t *testing.T, bal *BucketAccessListener) { diff --git a/pkg/imported-sidecar/pkg/consts/consts.go b/sidecar/pkg/consts/consts.go similarity index 100% rename from pkg/imported-sidecar/pkg/consts/consts.go rename to sidecar/pkg/consts/consts.go diff --git a/pkg/imported-sidecar/pkg/provisioner/client.go b/sidecar/pkg/provisioner/client.go similarity index 97% rename from pkg/imported-sidecar/pkg/provisioner/client.go rename to sidecar/pkg/provisioner/client.go index 627d1dea..5541ce65 100644 --- a/pkg/imported-sidecar/pkg/provisioner/client.go +++ b/sidecar/pkg/provisioner/client.go @@ -19,7 +19,7 @@ import ( "context" "google.golang.org/grpc" - cosi "sigs.k8s.io/container-object-storage-interface-spec" + cosi "sigs.k8s.io/container-object-storage-interface-api/proto" ) var ( diff --git a/pkg/imported-sidecar/pkg/provisioner/interceptors.go b/sidecar/pkg/provisioner/interceptors.go similarity index 100% rename from pkg/imported-sidecar/pkg/provisioner/interceptors.go rename to sidecar/pkg/provisioner/interceptors.go diff --git a/pkg/imported-sidecar/pkg/provisioner/provisioner.go b/sidecar/pkg/provisioner/provisioner.go similarity index 98% rename from pkg/imported-sidecar/pkg/provisioner/provisioner.go rename to sidecar/pkg/provisioner/provisioner.go index f8b133d3..3f783519 100644 --- a/pkg/imported-sidecar/pkg/provisioner/provisioner.go +++ b/sidecar/pkg/provisioner/provisioner.go @@ -25,9 +25,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/backoff" "google.golang.org/grpc/credentials/insecure" - "k8s.io/klog/v2" - cosi "sigs.k8s.io/container-object-storage-interface-spec" + cosi "sigs.k8s.io/container-object-storage-interface-api/proto" ) const ( diff --git a/pkg/imported-sidecar/pkg/provisioner/server.go b/sidecar/pkg/provisioner/server.go similarity index 97% rename from pkg/imported-sidecar/pkg/provisioner/server.go rename to sidecar/pkg/provisioner/server.go index 18d26f1b..d3325137 100644 --- a/pkg/imported-sidecar/pkg/provisioner/server.go +++ b/sidecar/pkg/provisioner/server.go @@ -21,9 +21,8 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "k8s.io/klog/v2" - cosi "sigs.k8s.io/container-object-storage-interface-spec" + cosi "sigs.k8s.io/container-object-storage-interface-api/proto" ) type COSIProvisionerServer struct {