Skip to content

Add GRPC Support to Mount and UnMount s3fs and rclone both #154

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.

Sign up for GitHub

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

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open

Add GRPC Support to Mount and UnMount s3fs and rclone both #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
373a098
update go.mod
ashimagarg27 Mar 12, 2025
ee7638b
cos apis
ashimagarg27 Mar 12, 2025
217aa92
cos apis
ashimagarg27 Mar 12, 2025
8b356b0
unmounting...
ashimagarg27 Mar 12, 2025
332a995
comments uts
ashimagarg27 Mar 12, 2025
26af783
cos apis
ashimagarg27 Mar 18, 2025
fdaed43
cos apis
ashimagarg27 Mar 19, 2025
88f3d1d
Merge branch 'main' into grpc-01
ashimagarg27 Mar 19, 2025
89c4f44
fix travis
ashimagarg27 Mar 19, 2025
1ff180f
cos apis
ashimagarg27 Mar 24, 2025
6edc289
cos apis
ashimagarg27 Mar 24, 2025
eef5704
cos apis
ashimagarg27 Mar 24, 2025
c4fd5d0
cos apis
ashimagarg27 Mar 24, 2025
aea5145
cos apis
ashimagarg27 Mar 25, 2025
97b8625
cos apis
ashimagarg27 Mar 25, 2025
e71c592
rebase branch and resolve conflicts
ashimagarg27 Apr 7, 2025
2bf8745
cos apis
ashimagarg27 Apr 7, 2025
0fe4a38
cos apis
ashimagarg27 Apr 7, 2025
58213fa
cos apis
ashimagarg27 Apr 7, 2025
5660a2d
cos apis
ashimagarg27 Apr 7, 2025
a5fee80
comment uts
ashimagarg27 Apr 7, 2025
263daa0
comment unused code
ashimagarg27 Apr 9, 2025
6680d77
rebase branch and resolve conflicts
ashimagarg27 Apr 9, 2025
78d1194
comment unused code
ashimagarg27 Apr 9, 2025
210dce2
fix backoff
ashimagarg27 Apr 14, 2025
41d7150
fix backoff
ashimagarg27 Apr 14, 2025
3397d3f
cos apis
ashimagarg27 Apr 14, 2025
23c5c6c
fix unmounting...
ashimagarg27 Apr 15, 2025
1c02d4b
fix travis
ashimagarg27 Apr 16, 2025
2b6c3d7
fix travis
ashimagarg27 Apr 16, 2025
179dd83
Merge branch 'main' into grpc-01
ashimagarg27 Apr 23, 2025
5a870d2
Grpc 02 (#161)
ashimagarg27 Apr 23, 2025
5f9fb24
fix rclone config path
ashimagarg27 Apr 30, 2025
f6137ce
resolve merge conflicts and rebase branch
ashimagarg27 May 7, 2025
0457fc5
update go.mod and go version
ashimagarg27 May 12, 2025
229e54b
map http codes to grpc
ashimagarg27 May 12, 2025
3e62a3b
Merge pull request #174 from IBM/add-latency
Bhagyashreek8 May 12, 2025
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
12 changes: 6 additions & 6 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.sum|^.secrets.baseline$",
"lines": null
},
"generated_at": "2025-05-07T06:35:25Z",
"generated_at": "2025-05-12T04:31:57Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -168,15 +168,15 @@
"hashed_secret": "39f69c278f46165447f30d10acf54277aaa3d5fc",
"is_secret": false,
"is_verified": false,
"line_number": 93,
"line_number": 92,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "2ace62c1befa19e3ea37dd52be9f6d508c5163e6",
"is_secret": false,
"is_verified": false,
"line_number": 252,
"line_number": 257,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -185,7 +185,7 @@
{
"hashed_secret": "2e7a7ee14caebf378fc32d6cf6f557f347c96773",
"is_verified": false,
"line_number": 358,
"line_number": 362,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -195,7 +195,7 @@
"hashed_secret": "39f69c278f46165447f30d10acf54277aaa3d5fc",
"is_secret": false,
"is_verified": false,
"line_number": 78,
"line_number": 75,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -204,7 +204,7 @@
{
"hashed_secret": "2e7a7ee14caebf378fc32d6cf6f557f347c96773",
"is_verified": false,
"line_number": 151,
"line_number": 152,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
dist: bionic
language: go
go:
- 1.24.1
- 1.24.3

group: bluezone

Expand Down
16 changes: 8 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1179.1741863533 as s3fs-builder
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1179.1741863533 AS s3fs-builder

ARG RHSM_PASS=blank
ARG RHSM_USER=blank

ENV RHSM_PASS "${RHSM_PASS}"
ENV RHSM_USER "${RHSM_USER}"
ENV RHSM_PASS="${RHSM_PASS}"
ENV RHSM_USER="${RHSM_USER}"

ADD register-sys.sh /usr/bin/
RUN microdnf update --setopt=tsflags=nodocs && \
Expand All @@ -26,11 +26,11 @@ RUN git clone https://github.com/s3fs-fuse/s3fs-fuse.git && cd s3fs-fuse && \
./autogen.sh && ./configure --prefix=/usr/local --with-openssl && make && make install && \
rm -rf /var/lib/apt/lists/*

FROM registry.access.redhat.com/ubi8/ubi as rclone-builder
FROM registry.access.redhat.com/ubi8/ubi AS rclone-builder
RUN yum install wget git gcc -y

ENV ARCH=amd64
ENV GO_VERSION=1.24.1
ENV GO_VERSION=1.24.3

RUN echo $ARCH $GO_VERSION

Expand All @@ -39,10 +39,10 @@ RUN wget -q https://dl.google.com/go/go$GO_VERSION.linux-$ARCH.tar.gz && \
rm go$GO_VERSION.linux-$ARCH.tar.gz && \
mv go /usr/local

ENV GOROOT /usr/local/go
ENV GOPATH /go
ENV GOROOT=/usr/local/go
ENV GOPATH=/go
ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH
ENV GOARCH $ARCH
ENV GOARCH=$ARCH
ENV GO111MODULE=on

RUN git clone https://github.com/rclone/rclone.git && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.builder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.24.1
FROM golang:1.24.3

WORKDIR /go/src/github.com/IBM/ibm-object-csi-driver
ADD . /go/src/github.com/IBM/ibm-object-csi-driver
Expand Down
2 changes: 1 addition & 1 deletion cos-csi-mounter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module cos-csi-mounter

go 1.24.1
go 1.24.3
39 changes: 20 additions & 19 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/IBM/ibm-object-csi-driver

go 1.24.1
go 1.24.3

require (
github.com/IBM/go-sdk-core/v5 v5.19.1
Expand All @@ -13,14 +13,14 @@ require (
github.com/google/uuid v1.6.0
github.com/kubernetes-csi/csi-test/v5 v5.3.1
github.com/mitchellh/go-ps v1.0.0
github.com/onsi/ginkgo/v2 v2.23.3
github.com/onsi/ginkgo/v2 v2.23.4
github.com/onsi/gomega v1.37.0
github.com/prometheus/client_golang v1.22.0
github.com/stretchr/testify v1.10.0
go.uber.org/zap v1.27.0
golang.org/x/net v0.38.0
google.golang.org/grpc v1.68.1
google.golang.org/protobuf v1.36.5
golang.org/x/net v0.40.0
google.golang.org/grpc v1.72.0
google.golang.org/protobuf v1.36.6
k8s.io/api v0.33.0
k8s.io/apimachinery v0.33.0
k8s.io/client-go v0.33.0
Expand All @@ -30,7 +30,7 @@ require (
)

require (
cel.dev/expr v0.19.1 // indirect
cel.dev/expr v0.20.0 // indirect
github.com/BurntSushi/toml v1.0.0 // indirect
github.com/IBM/secret-utils-lib v1.1.13 // indirect
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
Expand Down Expand Up @@ -77,7 +77,7 @@ require (
github.com/google/cel-go v0.23.2 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
Expand Down Expand Up @@ -119,25 +119,26 @@ require (
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
go.opentelemetry.io/otel v1.33.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
go.opentelemetry.io/otel/metric v1.33.0 // indirect
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
go.opentelemetry.io/otel/trace v1.33.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
go.opentelemetry.io/otel/trace v1.34.0 // indirect
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.36.0 // indirect
golang.org/x/crypto v0.38.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/sync v0.12.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/term v0.30.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/sync v0.14.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.25.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.30.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
golang.org/x/tools v0.31.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading