hanzoai/s3-csi
2
0
Fork 0
mirror of https://github.com/hanzoai/s3-csi.git synced 2026-09-30 23:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ask for the filer's ZAP address by its own name (#13)

Browse Source 
The driver's storage client has been ZAP-native for a while, but it still found
its endpoint by calling ToGrpcAddress() -- naming a protocol that is not on that
port. hanzoai/s3 now exposes ToFilerZapAddress() (hanzoai/s3#19), so the driver
asks for what it actually wants.

No gRPC name remains anywhere in this driver's storage path. The kubelet-facing
side stays CSI gRPC, because that is the Kubernetes contract between kubelet and
any CSI driver, not a choice this repo gets to make.

Both sides move to s3 v1.0.5, which carries the new method.

Co-authored-by: hanzo-dev <[email protected]>
This commit is contained in:
zeekay
2026-07-27 23:01:27 -07:00
committed by GitHub
co-authored by hanzo-dev
parent 497041e6d0
commit 37aab4e185
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/integration_test.yaml
+3 -3
View File
@@ -65,11 +65,11 @@ jobs:
# the rollout. Retry the docker pull a few times to ride through
# transient registry hiccups.
for i in 1 2 3; do
docker pull ghcr.io/hanzoai/s3:v1.0.4 && break
docker pull ghcr.io/hanzoai/s3:v1.0.5 && break
echo "docker pull attempt $i failed, retrying..."
sleep 10
done
kind load docker-image ghcr.io/hanzoai/s3:v1.0.4 --name csi-test
kind load docker-image ghcr.io/hanzoai/s3:v1.0.5 --name csi-test
- name: Deploy S3
run: |
@@ -122,7 +122,7 @@ jobs:
enableServiceLinks: false
containers:
- name: s3
image: ghcr.io/hanzoai/s3:v1.0.4
image: ghcr.io/hanzoai/s3:v1.0.5
# Use the image preloaded into kind by the workflow so we
# do not re-pull from Docker Hub (anonymous rate limits
# have caused ImagePullBackOff in CI).
go.mod
+1 -1
View File
@@ -10,7 +10,7 @@ require (
)
require (
github.com/hanzoai/s3 v1.0.4
github.com/hanzoai/s3 v1.0.5
golang.org/x/sys v0.47.0
k8s.io/api v0.32.0
k8s.io/apimachinery v0.32.0
go.sum
+2 -2
View File
@@ -59,8 +59,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/hanzoai/goexif v1.0.4 h1:ttNObsfiO3z8A4jA91l3YtMELGAXyMfVr8ckgNm9AwE=
github.com/hanzoai/goexif v1.0.4/go.mod h1:eZsa4Rlv4Vqf/hGAjq5kRGBQTDDiZdkqsw6vEXTs3p4=
github.com/hanzoai/s3 v1.0.4 h1:DT40QDeYRQ0gv8zRN/pY6taN7mxWTY8K3c5jbCow7K8=
github.com/hanzoai/s3 v1.0.4/go.mod h1:JEK/+JeTzioEYro9bc4JrgSjsFJlz+WCIyXENTavafs=
github.com/hanzoai/s3 v1.0.5 h1:/hb8vroa+abcz+FzhU3PsT+bVg2lBNMioi4CGc36uTU=
github.com/hanzoai/s3 v1.0.5/go.mod h1:JEK/+JeTzioEYro9bc4JrgSjsFJlz+WCIyXENTavafs=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
pkg/driver/driver.go
+1 -1
View File
@@ -173,7 +173,7 @@ func (d *S3Driver) ValidateControllerServiceRequest(c csi.ControllerServiceCapab
// single ZAP connection, so Create/Delete/Validate do not each open a socket.
func (d *S3Driver) Filer() *filer.Client {
if d.zapFiler == nil {
d.zapFiler = filer.New(d.filers[d.filerIndex].ToGrpcAddress())
d.zapFiler = filer.New(d.filers[d.filerIndex].ToFilerZapAddress())
}
return d.zapFiler
}