Skip to content

Commit

Permalink
Merge pull request openebs-archive#188 from thepriefy/patch-1
Browse files Browse the repository at this point in the history
Fix linting issues maya/types/v1/util.go
  • Loading branch information
kmova authored Nov 16, 2017
2 parents 0a93315 + a860d32 commit 3a94c9e
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions types/v1/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ func DefaultVolumeProvisionerName() VolumeProvisionerRegistry {
return DefaultVolumeProvisioner
}

// GetOrchestratorRegion gets the not nil name of orchestrator
// GetOrchestratorName gets the not nil name of orchestrator
func GetOrchestratorName(profileMap map[string]string) OrchProviderRegistry {
val := OrchestratorName(profileMap)
if val == "" {
Expand Down Expand Up @@ -335,6 +335,8 @@ func OrchestratorAddress(profileMap map[string]string) string {
return val
}

// DefaultOrchestratorAddress gets the coded default address of orchestration
// provider.
func DefaultOrchestratorAddress() string {
return string(OrchAddressDef)
}
Expand Down Expand Up @@ -976,7 +978,8 @@ func Replicas(rcount int) *int32 {
return &o
}

//
// MakeOrDefJivaControllerArgs will set the placeholders in jiva controller args with
// their appropriate runtime values.
func MakeOrDefJivaControllerArgs(vsm string, clusterIP string) []string {
if strings.TrimSpace(vsm) == "" || strings.TrimSpace(clusterIP) == "" {
return nil
Expand Down Expand Up @@ -1026,7 +1029,7 @@ func DefaultJivaReplicaPort3() int32 {
return int32(p)
}

//
// SanitiseVSMName trim the controller or replica suffix
func SanitiseVSMName(vsm string) string {
// Trim the controller suffix if controller based
v := strings.TrimSuffix(vsm, string(ControllerSuffix))
Expand Down

0 comments on commit 3a94c9e

Please sign in to comment.