diff --git a/pkg/webhook/pod/pd_deleter.go b/pkg/webhook/pod/pd_deleter.go index d0ce4346b50..e520d262ce1 100644 --- a/pkg/webhook/pod/pd_deleter.go +++ b/pkg/webhook/pod/pd_deleter.go @@ -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) } } diff --git a/tests/actions.go b/tests/actions.go index cb1b9540833..923a1b2cbe9 100644 --- a/tests/actions.go +++ b/tests/actions.go @@ -111,8 +111,6 @@ const ( ) type OperatorActions interface { - CleanServiceOrDie() - CleanDeploymentOrDie() CleanValidatingWebhookConfigurationOrDie() CleanCRDOrDie() InstallCRDOrDie() @@ -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")) diff --git a/tests/cmd/e2e/main.go b/tests/cmd/e2e/main.go index a5024cfcd9f..ee25dce31eb 100644 --- a/tests/cmd/e2e/main.go +++ b/tests/cmd/e2e/main.go @@ -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()