Skip to content
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: go
go:
- 1.24.2
- 1.24.5

group: bluezone
dist: focal
Expand Down
82 changes: 1 addition & 81 deletions OPENSOURCE
Original file line number Diff line number Diff line change
@@ -1,81 +1 @@
github.com/BurntSushi/toml,v1.4.0,direct
github.com/IBM/go-sdk-core/v5,v5.20.1,direct
github.com/IBM/ibm-cos-sdk-go,v1.12.2,direct
github.com/IBM/ibm-cos-sdk-go-config/v2,v2.3.0,direct
github.com/gofrs/uuid,v4.4.0+incompatible,direct
github.com/golang/protobuf,v1.5.4,direct
github.com/jessevdk/go-flags,v1.6.1,direct
github.com/stretchr/testify,v1.10.0,direct
go.uber.org/zap,v1.27.0,direct
google.golang.org/grpc,v1.69.4,direct
google.golang.org/protobuf,v1.36.3,direct
gopkg.in/natefinch/lumberjack.v2,v2.2.1,direct
k8s.io/api,v0.32.1,direct
k8s.io/apimachinery,v0.32.1,direct
k8s.io/client-go,v0.32.1,direct
sigs.k8s.io/sig-storage-lib-external-provisioner/v6,v6.3.0,direct
github.com/asaskevich/govalidator,v0.0.0-20230301143203-a9d515a09cc2,indirect
github.com/beorn7/perks,v1.0.1,indirect
github.com/cespare/xxhash/v2,v2.3.0,indirect
github.com/davecgh/go-spew,v1.1.2-0.20180830191138-d8f796af33cc,indirect
github.com/emicklei/go-restful/v3,v3.12.1,indirect
github.com/fxamacker/cbor/v2,v2.7.0,indirect
github.com/gabriel-vasile/mimetype,v1.4.8,indirect
github.com/go-logr/logr,v1.4.2,indirect
github.com/go-openapi/errors,v0.22.0,indirect
github.com/go-openapi/jsonpointer,v0.21.0,indirect
github.com/go-openapi/jsonreference,v0.21.0,indirect
github.com/go-openapi/strfmt,v0.23.0,indirect
github.com/go-openapi/swag,v0.23.0,indirect
github.com/go-playground/locales,v0.14.1,indirect
github.com/go-playground/universal-translator,v0.18.1,indirect
github.com/go-playground/validator/v10,v10.26.0,indirect
github.com/gogo/protobuf,v1.3.2,indirect
github.com/google/gnostic-models,v0.6.9,indirect
github.com/google/go-cmp,v0.7.0,indirect
github.com/google/gofuzz,v1.2.0,indirect
github.com/google/uuid,v1.6.0,indirect
github.com/hashicorp/go-cleanhttp,v0.5.2,indirect
github.com/hashicorp/go-retryablehttp,v0.7.7,indirect
github.com/jmespath/go-jmespath,v0.4.0,indirect
github.com/josharian/intern,v1.0.0,indirect
github.com/json-iterator/go,v1.1.12,indirect
github.com/klauspost/compress,v1.17.11,indirect
github.com/leodido/go-urn,v1.4.0,indirect
github.com/mailru/easyjson,v0.9.0,indirect
github.com/miekg/dns,v1.1.62,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/oklog/ulid,v1.3.1,indirect
github.com/pkg/errors,v0.9.1,indirect
github.com/pmezard/go-difflib,v1.0.1-0.20181226105442-5d4384ee4fb2,indirect
github.com/prometheus/client_golang,v1.20.5,indirect
github.com/prometheus/client_model,v0.6.1,indirect
github.com/prometheus/common,v0.62.0,indirect
github.com/prometheus/procfs,v0.15.1,indirect
github.com/spf13/pflag,v1.0.5,indirect
github.com/x448/float16,v0.8.4,indirect
go.mongodb.org/mongo-driver,v1.17.2,indirect
go.uber.org/multierr,v1.11.0,indirect
golang.org/x/crypto,v0.38.0,indirect
golang.org/x/mod,v0.22.0,indirect
golang.org/x/net,v0.38.0,indirect
golang.org/x/oauth2,v0.25.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.29.0,indirect
google.golang.org/genproto/googleapis/rpc,v0.0.0-20250115164207-1a7da9e5054f,indirect
gopkg.in/evanphx/json-patch.v4,v4.12.0,indirect
gopkg.in/inf.v0,v0.9.1,indirect
gopkg.in/yaml.v3,v3.0.1,indirect
k8s.io/klog/v2,v2.130.1,indirect
k8s.io/kube-openapi,v0.0.0-20241212222426-2c72e554b1e7,indirect
k8s.io/utils,v0.0.0-20241210054802-24370beab758,indirect
sigs.k8s.io/json,v0.0.0-20241014173422-cfa47c3a1cc8,indirect
sigs.k8s.io/structured-merge-diff/v4,v4.5.0,indirect
sigs.k8s.io/yaml,v1.4.0,indirect

10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Before installing IBM Cloud Object Storage plug-in in a Kubernetes cluster, ensu
2. [S3FS-FUSE](https://github.com/s3fs-fuse/s3fs-fuse#installation) should be installed on every worker node in the cluster.

## Build the `provisioner` image and `driver` binary
For building the **provisioner** image and the **driver** binary, `docker`, `GO` and `glide` should be installed on your local system.<br>
1. On your local machine, install [`docker`](https://docs.docker.com/install/), [`Go`](https://golang.org/doc/install), and [`glide`](https://glide.sh/).
For building the **provisioner** image and the **driver** binary, `docker`and `GO` should be installed on your local system.<br>
1. On your local machine, install [`docker`](https://docs.docker.com/install/), [`Go`](https://golang.org/doc/install).
2. Set the [`GOPATH` environment variable](https://github.com/golang/go/wiki/SettingGOPATH).
3. Build the provisioner container image and the driver binary<br>
clone the repo or your forked repo
Expand All @@ -22,7 +22,7 @@ For building the **provisioner** image and the **driver** binary, `docker`, `GO`
```
build project and runs testcases
```
$ make
$ make all
```
build container image for the provisioner
```
Expand All @@ -48,7 +48,7 @@ Push the provisioner container image from the build system to your image reposit
$ sudo systemctl restart kubelet
```
3. Create the provisioner.<br>
Before executing following command update `image` details as per your repository in `deploy/provisioner.yaml`. Currently, it is `image: ibmcloud-object-storage-plugin:latest`, which expects image to be in public docker hub
Before executing following command update `image` details as per your repository in `deploy/provisioner.yaml`.
```
$ kubectl create -f deploy/provisioner-sa.yaml
$ kubectl create -f deploy/provisioner.yaml
Expand Down Expand Up @@ -88,7 +88,7 @@ data:
access-key: <access key encoded in base64 (when not using IAM OAuth)>
secret-key: <secret key encoded in base64 (when not using IAM OAuth)>
api-key: <api key encoded in base64 (for IAM OAuth)>
service-instance-id: <service-instance-id encoded in base64 (for IAM OAuth + bucket creation)>
service-instance-id: <resource_instance_id encoded in base64 (for IAM OAuth + bucket creation)>
EOF
```
**Note**: Replace **<NAMESPACE_NAME>** with your namespace (for example: default).<br>
Expand Down
16 changes: 10 additions & 6 deletions cmd/driver/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* IBM Confidential
* OCO Source Materials
* IBM Cloud Kubernetes Service, 5737-D43
* (C) Copyright IBM Corp. 2017, 2023 All Rights Reserved.
* (C) Copyright IBM Corp. 2017, 2025 All Rights Reserved.
* The source code for this program is not published or otherwise divested of
* its trade secrets, irrespective of what has been deposited with
* the U.S. Copyright Office.
Expand All @@ -21,7 +21,7 @@ import (
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"gopkg.in/natefinch/lumberjack.v2"
"io/ioutil"
"io"
"log"
"os"
"strings"
Expand Down Expand Up @@ -60,7 +60,9 @@ func NewS3fsPlugin(logger *zap.Logger) *driver.S3fsPlugin {
type versionCommand struct{}

func (v *versionCommand) Execute(args []string) error {
fmt.Fprintf(stdout, "Version:%s, Build:%s\n", Version, Build)
if _, err := fmt.Fprintf(stdout, "Version:%s, Build:%s\n", Version, Build); err != nil {
return err
}
return nil
}

Expand Down Expand Up @@ -108,7 +110,7 @@ func (m *mountCommand) Execute(args []string) error {
filelogger.Info(":MountCommand start:" + hostname)

mountOpts := make(map[string]string)
mountOptsLogs := make(map[string]string) // nolint:ineffassign
//mountOptsLogs := make(map[string]string) // nolint:ineffassign

switch len(args) {
case 2:
Expand Down Expand Up @@ -208,7 +210,7 @@ func main() {
// disable the console logging (if anywhere else being done by softlayer or any other pkg)
// presently softlayer logs few warning message, which makes the flexdriver unmarshall failure
log.SetFlags(0)
log.SetOutput(ioutil.Discard)
log.SetOutput(io.Discard)

// Divert all loggers outputs and fmt.printf loggings (this will create issues with flex response)
NullDevice, _ := os.Open(os.DevNull)
Expand Down Expand Up @@ -294,7 +296,9 @@ func printResponse(f interfaces.FlexVolumeResponse) error {
filelogger.Info(":FlexVolumeResponse", zap.String("output", output))

// write it to stdout, so that flexdriver will read it
fmt.Fprintf(stdout, "%s", output)
if _, err := fmt.Fprintf(stdout, "%s", output); err != nil {
return err
}
return nil
}

Expand Down
Loading