mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-26 08:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #127 from humblec/clean

Browse Source 
Remove unwanted else block and add comments about some exported funtions and variables
This commit is contained in:
Huamin Chen 2019-01-16 07:14:25 -05:00 committed by GitHub
commit cf3855514f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cephfs/cephuser.go
View File

@ -96,7 +96,7 @@ func createCephUser(volOptions *volumeOptions, adminCr *credentials, volId volum
"osd", caps.Osd, "osd", caps.Osd,
} }
if err := execCommandJson(&ents, "ceph", args[:]...); err != nil { if err := execCommandJSON(&ents, "ceph", args[:]...); err != nil {
return nil, fmt.Errorf("error creating ceph user: %v", err) return nil, fmt.Errorf("error creating ceph user: %v", err)
} }

5
pkg/cephfs/driver.go
View File

@ -26,8 +26,10 @@ import (
) )
const ( const (
// PluginFolder is the kubelet plugin directory for cephfs plugin
PluginFolder = "/var/lib/kubelet/plugins/csi-cephfsplugin" PluginFolder = "/var/lib/kubelet/plugins/csi-cephfsplugin"
Version = "0.3.0" // Version of the cephfs csi driver
Version = "0.3.0"
) )
type cephfsDriver struct { type cephfsDriver struct {
@ -46,6 +48,7 @@ var (
DefaultVolumeMounter string DefaultVolumeMounter string
) )
// NewCephFSDriver provides a remote csi cephfs driver object.
func NewCephFSDriver() *cephfsDriver { func NewCephFSDriver() *cephfsDriver {
return &cephfsDriver{} return &cephfsDriver{}
} }

2
pkg/cephfs/util.go
View File

@ -53,7 +53,7 @@ func execCommandAndValidate(program string, args ...string) error {
return nil return nil
} }
func execCommandJson(v interface{}, program string, args ...string) error { func execCommandJSON(v interface{}, program string, args ...string) error {
out, err := execCommand(program, args...) out, err := execCommand(program, args...)
if err != nil { if err != nil {

51
pkg/util/k8scmcache.go
View File

@ -119,33 +119,32 @@ func (k8scm *K8sCMCache) Create(identifier string, data interface{}) error {
if cm != nil && err == nil { if cm != nil && err == nil {
glog.V(4).Infof("k8s-cm-cache: configmap already exists, skipping configmap creation") glog.V(4).Infof("k8s-cm-cache: configmap already exists, skipping configmap creation")
return nil return nil
} else {
dataJson, err := json.Marshal(data)
if err != nil {
return errors.Wrap(err, "k8s-cm-cache: marshal error")
}
cm := &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: identifier,
Namespace: k8scm.Namespace,
Labels: map[string]string{
csiMetadataLabelAttr: cmLabel,
},
},
Data: map[string]string{},
}
cm.Data[cmDataKey] = string(dataJson)
_, err = k8scm.Client.CoreV1().ConfigMaps(k8scm.Namespace).Create(cm)
if err != nil {
if apierrs.IsAlreadyExists(err) {
glog.V(4).Infof("k8s-cm-cache: configmap already exists")
return nil
}
return errors.Wrapf(err, "k8s-cm-cache: couldn't persist %s metadata as configmap", identifier)
}
} }
dataJSON, err := json.Marshal(data)
if err != nil {
return errors.Wrap(err, "k8s-cm-cache: marshal error")
}
cm = &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: identifier,
Namespace: k8scm.Namespace,
Labels: map[string]string{
csiMetadataLabelAttr: cmLabel,
},
},
Data: map[string]string{},
}
cm.Data[cmDataKey] = string(dataJSON)
_, err = k8scm.Client.CoreV1().ConfigMaps(k8scm.Namespace).Create(cm)
if err != nil {
if apierrs.IsAlreadyExists(err) {
glog.V(4).Infof("k8s-cm-cache: configmap already exists")
return nil
}
return errors.Wrapf(err, "k8s-cm-cache: couldn't persist %s metadata as configmap", identifier)
}
glog.V(4).Infof("k8s-cm-cache: configmap %s successfully created\n", identifier) glog.V(4).Infof("k8s-cm-cache: configmap %s successfully created\n", identifier)
return nil return nil
} }