Skip to content

Commit

Permalink
Fix some format errors
Browse files Browse the repository at this point in the history
  • Loading branch information
leonwanghui committed Oct 24, 2018
1 parent 03f4856 commit ee2386a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
3 changes: 1 addition & 2 deletions opensds-provisioner/cmd/provisioner/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package main

import (
"flag"
"strings"

"github.com/golang/glog"
"github.com/kubernetes-incubator/external-storage/lib/controller"

"github.com/opensds/nbp/opensds-provisioner/pkg/client"
"github.com/opensds/nbp/opensds-provisioner/pkg/volume"
"k8s.io/apimachinery/pkg/util/validation"
Expand All @@ -31,7 +31,6 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"strings"
)

var (
Expand Down
11 changes: 6 additions & 5 deletions opensds-provisioner/pkg/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,18 @@ package client

import (
"fmt"
"os"
"strconv"

"github.com/opensds/opensds/client"
"github.com/opensds/opensds/pkg/model"
"github.com/opensds/opensds/pkg/utils/constants"
"os"
"strconv"
)

const (
// OpenSDSEndPoint environment variable name
OpenSDSEndPoint = "OPENSDS_ENDPOINT"

// OpenSDSAuthStrategy environment variable name
OpenSDSAuthStrategy = "OPENSDS_AUTH_STRATEGY"
)
Expand Down Expand Up @@ -108,9 +109,9 @@ func getSdsClient(endpoint string, authStrategy string) *client.Client {
// Using default auth strategy
authStrategy = "noauth"
}

cfg := &client.Config{Endpoint: endpoint}

switch authStrategy {
case client.Keystone:
cfg.AuthOptions = client.LoadKeystoneAuthOptionsFromEnv()
Expand Down
3 changes: 2 additions & 1 deletion opensds-provisioner/pkg/volume/provision.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ limitations under the License.
package volume

import (
"strconv"

"github.com/golang/glog"
"github.com/kubernetes-incubator/external-storage/lib/controller"
"github.com/opensds/nbp/opensds-provisioner/pkg/client"
Expand All @@ -26,7 +28,6 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/pkg/volume"
"strconv"
)

const (
Expand Down

0 comments on commit ee2386a

Please sign in to comment.