Skip to content

Commit

Permalink
replace heketi client implementation
Browse files Browse the repository at this point in the history
This change makes use of github.com/sigma/heketi branch k8s-standalone, which is
a stripped down, k8s-specific version of github.com/heketi/heketi with:
- only useful client-code, which sidesteps the issue of heketi improperly
  vendoring k8s (which prevents vgo from working, see kubernetes#65683)
- uses only Apache 2 licensed code (which addresses partially
  kubernetes/sig-release#223)

For details, see
sigma/heketi@d481979
  • Loading branch information
sigma committed Aug 15, 2018
1 parent c5d15cb commit 5bc0e0b
Show file tree
Hide file tree
Showing 38 changed files with 705 additions and 1,967 deletions.
35 changes: 15 additions & 20 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

877 changes: 624 additions & 253 deletions Godeps/LICENSES

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pkg/volume/glusterfs/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/heketi/heketi/client/api/go-client:go_default_library",
"//vendor/github.com/heketi/heketi/pkg/glusterfs/api:go_default_library",
"//vendor/github.com/sigma/heketi/client/api/go-client:go_default_library",
"//vendor/github.com/sigma/heketi/pkg/glusterfs/api:go_default_library",
],
)

Expand All @@ -54,7 +54,7 @@ go_test(
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
"//staging/src/k8s.io/client-go/testing:go_default_library",
"//staging/src/k8s.io/client-go/util/testing:go_default_library",
"//vendor/github.com/heketi/heketi/pkg/glusterfs/api:go_default_library",
"//vendor/github.com/sigma/heketi/pkg/glusterfs/api:go_default_library",
],
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/volume/glusterfs/glusterfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"sync"

"github.com/golang/glog"
gcli "github.com/heketi/heketi/client/api/go-client"
gapi "github.com/heketi/heketi/pkg/glusterfs/api"
gcli "github.com/sigma/heketi/client/api/go-client"
gapi "github.com/sigma/heketi/pkg/glusterfs/api"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
2 changes: 1 addition & 1 deletion pkg/volume/glusterfs/glusterfs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"reflect"
"testing"

gapi "github.com/heketi/heketi/pkg/glusterfs/api"
gapi "github.com/sigma/heketi/pkg/glusterfs/api"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
7 changes: 3 additions & 4 deletions vendor/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,6 @@ filegroup(
"//vendor/github.com/grpc-ecosystem/grpc-gateway/utilities:all-srcs",
"//vendor/github.com/hashicorp/golang-lru:all-srcs",
"//vendor/github.com/hashicorp/hcl:all-srcs",
"//vendor/github.com/heketi/heketi/client/api/go-client:all-srcs",
"//vendor/github.com/heketi/heketi/pkg/glusterfs/api:all-srcs",
"//vendor/github.com/heketi/heketi/pkg/utils:all-srcs",
"//vendor/github.com/imdario/mergo:all-srcs",
"//vendor/github.com/inconshreveable/mousetrap:all-srcs",
"//vendor/github.com/jmespath/go-jmespath:all-srcs",
Expand All @@ -296,7 +293,6 @@ filegroup(
"//vendor/github.com/libopenstorage/openstorage/pkg/parser:all-srcs",
"//vendor/github.com/libopenstorage/openstorage/pkg/units:all-srcs",
"//vendor/github.com/libopenstorage/openstorage/volume:all-srcs",
"//vendor/github.com/lpabon/godbc:all-srcs",
"//vendor/github.com/magiconair/properties:all-srcs",
"//vendor/github.com/mailru/easyjson/buffer:all-srcs",
"//vendor/github.com/mailru/easyjson/jlexer:all-srcs",
Expand Down Expand Up @@ -346,6 +342,9 @@ filegroup(
"//vendor/github.com/satori/go.uuid:all-srcs",
"//vendor/github.com/seccomp/libseccomp-golang:all-srcs",
"//vendor/github.com/shurcooL/sanitized_anchor_name:all-srcs",
"//vendor/github.com/sigma/heketi/client/api/go-client:all-srcs",
"//vendor/github.com/sigma/heketi/pkg/glusterfs/api:all-srcs",
"//vendor/github.com/sigma/heketi/pkg/utils:all-srcs",
"//vendor/github.com/sirupsen/logrus:all-srcs",
"//vendor/github.com/spf13/afero:all-srcs",
"//vendor/github.com/spf13/cast:all-srcs",
Expand Down
Loading

0 comments on commit 5bc0e0b

Please sign in to comment.