Skip to content

Commit

Permalink
Merge pull request #84 from IBM/dev
Browse files Browse the repository at this point in the history
Ubiquity k8s POC v0.4.0
  • Loading branch information
shay-berman committed Aug 30, 2017
2 parents 7b71b94 + bb59782 commit 185621d
Show file tree
Hide file tree
Showing 1,331 changed files with 826 additions and 549,052 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
*.o
*.a
*.so

glide.lock
tmp/*

.idea/*
out/*
bin/*
gobin/*
# Folders
vendor
_obj
_test
.idea
Expand All @@ -22,7 +23,7 @@ _cgo_gotypes.go
_cgo_export.*

_testmain.go

*.coverprofile
*.exe
*.test
.DS_STORE
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go:
- 1.7

install:
- sh scripts/run_glide_up
- sh scripts/build

script:
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Ubiquity Storage Service for Container Ecosystems
[![Build Status](https://travis-ci.org/IBM/ubiquity.svg?branch=master)](https://travis-ci.org/IBM/ubiquity)[![GoDoc](https://godoc.org/github.com/IBM/ubiquity?status.svg)](https://godoc.org/github.com/IBM/ubiquity)[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)[![Go Report Card](https://goreportcard.com/badge/github.com/IBM/ubiquity)](https://goreportcard.com/report/github.com/IBM/ubiquity)
[![Build Status](https://travis-ci.org/IBM/ubiquity.svg?branch=master)](https://travis-ci.org/IBM/ubiquity)
[![GoDoc](https://godoc.org/github.com/IBM/ubiquity?status.svg)](https://godoc.org/github.com/IBM/ubiquity)
[![Coverage Status](https://coveralls.io/repos/github/IBM/ubiquity/badge.svg?branch=dev)](https://coveralls.io/github/IBM/ubiquity?branch=dev)
[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
[![Go Report Card](https://goreportcard.com/badge/github.com/IBM/ubiquity)](https://goreportcard.com/report/github.com/IBM/ubiquity)

The Ubiquity project enables persistent storage for the Kubernetes and Docker container frameworks.
It is a pluggable framework available for different storage systems. The framework interfaces with the storage systems, using their plugins. The [Available Storage Systems](supportedStorage.md) section describes the storage system configuration and deployment options. Different container frameworks can use Ubiquity concurrently, allowing access to different storage systems.
Expand Down Expand Up @@ -87,7 +91,6 @@ To use the active Ubiquity service, install Ubiquity plugins for the relevant co


## Contribution
Our team welcomes any contribution.
To contribute, follow the guidelines in [Contribution guide](contribution-guide.md)


Expand Down
2 changes: 1 addition & 1 deletion contribution-guide.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Contribution guide
The Ubiquity team uses GitHub to accept contributions via pull requests.
The Ubiquity team accepts contributions from IBM employees using GitHub pull requests.
Pushing to master is not allowed. Any direct push to master might interfere with our CI process.

If you want to make a change, create your own branch out of `dev` branch, make your changes. Once you are done, submit a pull request to the `dev` branch. When accepted, the changes will make their way into `master` after we merge.
Expand Down
127 changes: 127 additions & 0 deletions fakes/fake_executor.go

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

67 changes: 0 additions & 67 deletions glide.lock

This file was deleted.

2 changes: 2 additions & 0 deletions local/spectrumscale/connectors/connectors.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ type SpectrumScaleConnector interface {
const (
UserSpecifiedFilesetType string = "fileset-type"
UserSpecifiedInodeLimit string = "inode-limit"
UserSpecifiedUid string = "uid"
UserSpecifiedGid string = "gid"
)

func GetSpectrumScaleConnector(logger *log.Logger, config resources.SpectrumScaleConfig) (SpectrumScaleConnector, error) {
Expand Down
4 changes: 2 additions & 2 deletions local/spectrumscale/connectors/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ type ClusterSummary struct {
ClusterName string `json:"clusterName,omitempty"`
PrimaryServer string `json:"primaryServer,omitempty"`
RcpPath string `json:"rcpPath,omitempty"`
RcpSudoWrapper string `json:"rcpSudoWrapper,omitempty"`
RepositoryType string `json:"repositoryType,omitempty"`
RshPath string `json:"rshPath,omitempty"`
SecondaryServer string `json:"secondaryServer,omitempty"`
Expand Down Expand Up @@ -499,6 +498,7 @@ type SetQuotaRequest_v2 struct {
FilesSoftLimit string `json:"filesSoftLimit,omitempty"`
OperationType string `json:"operationType,omitempty"`
QuotaType string `json:"quotaType,omitempty"`
ObjectName string `json:"objectName,omitempty"`
}

type LinkFilesetRequest struct {
Expand All @@ -515,7 +515,7 @@ type CreateFilesetRequest struct {
Owner string `json:"owner,omitempty"`
Permissions string `json:"permissions,omitempty"`
InodeSpace string `json:"inodeSpace,omitempty"`
MaxNumInodes string `json:"maxNumInode,omitempty"`
MaxNumInodes string `json:"maxNumInodes,omitempty"`
AllocInodes string `json:"allocInodes,omitempty"`
PermissionChangeMode string `json:"permissionChangeMode,omitempty"`
Comment string `json:"comment,omitempty"`
Expand Down

0 comments on commit 185621d

Please sign in to comment.