Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump deps #26

Merged
merged 3 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
- uses: actions/[email protected]
# https://github.com/golangci/golangci-lint-action
- name: golangci-lint
uses: golangci/golangci-lint-action@v3.4.0
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
with:
version: v1.55.2
version: v1.61.0
args: --timeout=5m
build:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.15-alpine as build
FROM golang:1.23.2-alpine3.20@sha256:9dd2625a1ff2859b8d8b01d8f7822c0f528942fe56cfe7a1e7c38d3b8d72d679 as build
RUN apk add git

WORKDIR /go/src/app
Expand All @@ -31,7 +31,7 @@ RUN CGO_ENABLED=0 GOOS=$OS GOARCH=$ARCH go build -a \
-o /go/bin/yandex-csi-driver \
github.com/deckhouse/yandex-csi-driver/cmd/yandex-csi-driver

FROM alpine:3.18
FROM alpine:3.20.3@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d

RUN apk add --no-cache ca-certificates \
e2fsprogs \
Expand Down
2 changes: 1 addition & 1 deletion driver/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
return nil, status.Error(codes.InvalidArgument, "CreateVolume Name must be provided")
}

if req.VolumeCapabilities == nil || len(req.VolumeCapabilities) == 0 {
if len(req.VolumeCapabilities) == 0 {
return nil, status.Error(codes.InvalidArgument, "CreateVolume Volume capabilities must be provided")
}

Expand Down
4 changes: 4 additions & 0 deletions driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ type Driver struct {
// be used by the `Identity` service via the `Probe()` method.
readyMu sync.Mutex // protects ready
ready bool

csi.UnimplementedIdentityServer
csi.UnimplementedControllerServer
csi.UnimplementedNodeServer
}

func (d *Driver) CreateSnapshot(context.Context, *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
Expand Down
9 changes: 3 additions & 6 deletions driver/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"k8s.io/klog"
"k8s.io/kubernetes/pkg/util/resizefs"
mountutil "k8s.io/mount-utils"
"k8s.io/utils/exec"
"k8s.io/utils/mount"
)
Expand Down Expand Up @@ -567,10 +567,7 @@ func (d *Driver) NodeExpandVolume(_ context.Context, req *csi.NodeExpandVolumeRe
return nil, status.Errorf(codes.Internal, "NodeExpandVolume unable to get device path for %q: %v", volumePath, err)
}

r := resizefs.NewResizeFs(&mount.SafeFormatAndMount{
Interface: mounter,
Exec: exec.New(),
})
r := mountutil.NewResizeFs(exec.New())

log = log.WithFields(logrus.Fields{
"device_path": devicePath,
Expand Down Expand Up @@ -642,7 +639,7 @@ func (d *Driver) nodePublishVolumeForBlock(req *csi.NodePublishVolumeRequest, mo
if !mounted {
log.Info("mounting the volume")
if err := d.mounter.Mount(source, target, "", mountOptions...); err != nil {
return status.Errorf(codes.Internal, err.Error())
return status.Error(codes.Internal, err.Error())
}
} else {
log.Info("volume is already mounted")
Expand Down
94 changes: 32 additions & 62 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,68 +1,38 @@
module github.com/deckhouse/yandex-csi-driver

go 1.23.0

require (
github.com/container-storage-interface/spec v1.2.0
github.com/golang/protobuf v1.5.2
github.com/sirupsen/logrus v1.4.2
github.com/yandex-cloud/go-genproto v0.0.0-20230828085742-c924b3bfee75
github.com/yandex-cloud/go-sdk v0.0.0-20230828093337-d401bc1eeaba
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
golang.org/x/sys v0.0.0-20210510120138-977fb7262007
google.golang.org/genproto v0.0.0-20211021150943-2b146023228c
google.golang.org/grpc v1.41.0
google.golang.org/protobuf v1.31.0
k8s.io/apimachinery v0.17.1
github.com/container-storage-interface/spec v1.11.0
github.com/golang/protobuf v1.5.4
github.com/sirupsen/logrus v1.9.3
github.com/yandex-cloud/go-genproto v0.0.0-20250127124313-5be1a2cc06d4
github.com/yandex-cloud/go-sdk v0.0.0-20250127132311-016f84adc072
golang.org/x/sync v0.10.0
golang.org/x/sys v0.29.0
google.golang.org/genproto v0.0.0-20250124145028-65684f501c47
google.golang.org/grpc v1.70.0
google.golang.org/protobuf v1.36.4
k8s.io/apimachinery v0.32.1
k8s.io/klog v1.0.0
k8s.io/kubernetes v1.17.1
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
k8s.io/mount-utils v0.32.1
k8s.io/utils v0.0.0-20241210054802-24370beab758
)

go 1.15

replace k8s.io/api => k8s.io/api v0.17.1

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.1

replace k8s.io/apimachinery => k8s.io/apimachinery v0.17.1

replace k8s.io/apiserver => k8s.io/apiserver v0.17.1

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.1

replace k8s.io/client-go => k8s.io/client-go v0.17.1

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.1

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.1

replace k8s.io/code-generator => k8s.io/code-generator v0.17.1-beta.0

replace k8s.io/component-base => k8s.io/component-base v0.17.1

replace k8s.io/cri-api => k8s.io/cri-api v0.17.1

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.1

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.1

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.1

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.1

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.1

replace k8s.io/kubectl => k8s.io/kubectl v0.17.1

replace k8s.io/kubelet => k8s.io/kubelet v0.17.1

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.1

replace k8s.io/metrics => k8s.io/metrics v0.17.1

replace k8s.io/node-api => k8s.io/node-api v0.17.1

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.1

replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.1

replace k8s.io/sample-controller => k8s.io/sample-controller v0.17.1
require (
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/stretchr/testify v1.10.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250124145028-65684f501c47 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
)
Loading
Loading