diff --git a/src/kubernetes/pods.go b/src/kubernetes/pods.go index ab1174c2..71e32920 100644 --- a/src/kubernetes/pods.go +++ b/src/kubernetes/pods.go @@ -34,7 +34,7 @@ func (kc *KubeCtl) DeletePod(name string) error { return kc.Clientset.CoreV1().Pods(kc.Namespace).Delete(name, &options) } -func (kc *KubeCtl) DoesPodCompleted(pod *corev1.Pod) bool { +func (kc *KubeCtl) IsPodCompleted(pod *corev1.Pod) bool { switch pod.Status.Phase { case corev1.PodRunning, corev1.PodPending: return false diff --git a/src/kubernetes/pods_test.go b/src/kubernetes/pods_test.go index 75d6a859..1b4997b0 100644 --- a/src/kubernetes/pods_test.go +++ b/src/kubernetes/pods_test.go @@ -109,10 +109,10 @@ func (suite *KubeCtlPodTestSuite) TestDoesPodCompleted() { suite.NoError(err) } - run := suite.kubectl.DoesPodCompleted(&pods[0]) + run := suite.kubectl.IsPodCompleted(&pods[0]) suite.False(run) - run = suite.kubectl.DoesPodCompleted(&pods[1]) + run = suite.kubectl.IsPodCompleted(&pods[1]) suite.True(run) } diff --git a/src/volume/volume.go b/src/volume/volume.go index 5db76c30..cb958a1f 100644 --- a/src/volume/volume.go +++ b/src/volume/volume.go @@ -64,7 +64,7 @@ func DeleteVolume(sp *serviceprovider.Container, volume *entity.Volume) error { pods := []entity.Pod{} err := session.FindAll(entity.PodCollectionName, bson.M{"volumes.name": volume.Name}, &pods) if err != nil { - return fmt.Errorf("Load the database fail:%v", err) + return fmt.Errorf("load the database fail:%v", err) } usedPod := []string{} @@ -75,13 +75,13 @@ func DeleteVolume(sp *serviceprovider.Container, volume *entity.Volume) error { continue } - if !sp.KubeCtl.DoesPodCompleted(currentPod) { + if !sp.KubeCtl.IsPodCompleted(currentPod) { usedPod = append(usedPod, pod.Name) } } if len(usedPod) != 0 { podNames := strings.Join(usedPod, ",") - return fmt.Errorf("Delete the volume [%s] fail, since the followings pods still ust it: %s", volume.Name, podNames) + return fmt.Errorf("delete the volume [%s] fail, since the followings pods still ust it: %s", volume.Name, podNames) } return sp.KubeCtl.DeletePVC(volume.GetPVCName())