diff --git a/tests/actions.go b/tests/actions.go index 26293d3e4a..cd0d90f49b 100644 --- a/tests/actions.go +++ b/tests/actions.go @@ -376,6 +376,15 @@ func (oa *operatorActions) DeployOperator(info *OperatorConfig) error { return fmt.Errorf("failed to deploy operator: %v, %s", err, string(res)) } + // delete statefulset update webhook and configuration + cmd = fmt.Sprintf("kubectl delete -f %s/webhook.yaml", oa.manifestPath(info.Tag)) + glog.Info(cmd) + + res, err = exec.Command("/bin/sh", "-c", cmd).CombinedOutput() + if err != nil && !notFound(string(res)) { + return fmt.Errorf("failed to delete statefulset webhook and configuration : %v, %s", err, string(res)) + } + // create cert and secret for webhook cmd = fmt.Sprintf("%s/create-cert.sh", oa.manifestPath(info.Tag)) glog.Info(cmd) @@ -420,16 +429,7 @@ func (oa *operatorActions) CleanOperator(info *OperatorConfig) error { return err } - // delete statefulset update webhook and configuration - cmd := fmt.Sprintf("kubectl delete -f %s/webhook.yaml", oa.manifestPath(info.Tag)) - glog.Info(cmd) - - res, err := exec.Command("/bin/sh", "-c", cmd).CombinedOutput() - if err != nil && !notFound(string(res)) { - return fmt.Errorf("failed to delete statefulset webhook and configuration : %v, %s", err, string(res)) - } - - res, err = exec.Command("helm", "del", "--purge", info.ReleaseName).CombinedOutput() + res, err := exec.Command("helm", "del", "--purge", info.ReleaseName).CombinedOutput() if err == nil || !releaseIsNotFound(err) { return nil diff --git a/tests/images/stability-test/Dockerfile b/tests/images/stability-test/Dockerfile index 93ff613b40..2da414b28c 100644 --- a/tests/images/stability-test/Dockerfile +++ b/tests/images/stability-test/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.5 ENV KUBECTL_VERSION=v1.12.2 ENV HELM_VERSION=v2.9.1 -RUN apk update && apk add --no-cache ca-certificates curl git +RUN apk update && apk add --no-cache ca-certificates curl git openssl bash RUN curl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl \ -o /usr/local/bin/kubectl && \ chmod +x /usr/local/bin/kubectl && \