Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Song Gao committed Oct 29, 2019
1 parent e9270ea commit 5623ac0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 13 deletions.
2 changes: 1 addition & 1 deletion pkg/webhook/pod/pd_deleter.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func AdmitDeletePdPods(pod *corev1.Pod, ownerStatefulSet *apps.StatefulSet, tc *
if isOutOfOrdinal {
err = addDeferDeletingToPVC(ownerStatefulSet.Name, namespace, ordinal)
if err != nil {
glog.Info("tc[%s/%s]'s pod[%s/%s] failed to update pvc,%v", namespace, tcName, namespace, namespace, err)
glog.Infof("tc[%s/%s]'s pod[%s/%s] failed to update pvc,%v", namespace, tcName, namespace, namespace, err)
return util.ARFail(err)
}
}
Expand Down
10 changes: 0 additions & 10 deletions tests/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ const (
)

type OperatorActions interface {
CleanServiceOrDie()
CleanDeploymentOrDie()
CleanValidatingWebhookConfigurationOrDie()
CleanCRDOrDie()
InstallCRDOrDie()
Expand Down Expand Up @@ -385,14 +383,6 @@ func (oa *operatorActions) CleanValidatingWebhookConfigurationOrDie() {
oa.runKubectlOrDie("delete", "validatingwebhookconfiguration", "--all")
}

func (oa *operatorActions) CleanDeploymentOrDie() {
oa.runKubectlOrDie("delete", "deployment", "--all")
}

func (oa *operatorActions) CleanServiceOrDie() {
oa.runKubectlOrDie("delete", "service", "--all")
}

// InstallCRDOrDie install CRDs and wait for them to be established in Kubernetes.
func (oa *operatorActions) InstallCRDOrDie() {
oa.runKubectlOrDie("apply", "-f", oa.manifestPath("e2e/crd.yaml"))
Expand Down
2 changes: 0 additions & 2 deletions tests/cmd/e2e/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ func main() {
oa := tests.NewOperatorActions(cli, kubeCli, tests.DefaultPollInterval, cfg, nil)
// Clean previous Webhook Server Service
oa.CleanValidatingWebhookConfigurationOrDie()
oa.CleanServiceOrDie()
oa.CleanDeploymentOrDie()
oa.CleanCRDOrDie()
oa.InstallCRDOrDie()
oa.LabelNodesOrDie()
Expand Down

0 comments on commit 5623ac0

Please sign in to comment.