From ece6894dc484577667c73163896269b48ba8720b Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Mon, 16 Dec 2019 21:20:02 +0200
Subject: [PATCH] Remove helm-op install from e2e tests

---
 test/e2e/10_helm_chart.bats |  1 -
 test/e2e/lib/install.bash   | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/test/e2e/10_helm_chart.bats b/test/e2e/10_helm_chart.bats
index 5c9d39bb3..68a229899 100644
--- a/test/e2e/10_helm_chart.bats
+++ b/test/e2e/10_helm_chart.bats
@@ -18,7 +18,6 @@ function setup() {
   # Test that the resources from https://github.com/fluxcd/flux-get-started are deployed
   poll_until_true 'namespace demo' 'kubectl describe ns/demo'
   poll_until_true 'workload podinfo' 'kubectl -n demo describe deployment/podinfo'
-  poll_until_true 'mongodb HelmRelease' 'kubectl -n demo describe helmrelease/mongodb'
 }
 
 function teardown() {
diff --git a/test/e2e/lib/install.bash b/test/e2e/lib/install.bash
index 9a133d99f..c97d5187d 100755
--- a/test/e2e/lib/install.bash
+++ b/test/e2e/lib/install.bash
@@ -22,12 +22,8 @@ function uninstall_tiller() {
 }
 
 function install_flux_with_helm() {
-  local create_crds='true'
-  if kubectl get crd fluxhelmreleases.helm.integrations.flux.weave.works helmreleases.flux.weave.works > /dev/null 2>&1; then
-    # CRDs existed, don't try to create them
-    echo 'CRDs existed, setting helmOperator.createCRD=false'
-    create_crds='false'
-  fi
+
+  kubectl apply -f https://raw.githubusercontent.com/fluxcd/helm-operator/v1.0.0-rc4/deploy/flux-helm-release-crd.yaml
 
   helm install --name flux --wait \
     --namespace "${FLUX_NAMESPACE}" \
@@ -39,9 +35,6 @@ function install_flux_with_helm() {
     --set git.config.secretName=gitconfig \
     --set git.config.enabled=true \
     --set-string git.config.data="${GITCONFIG}" \
-    --set helmOperator.create=true \
-    --set helmOperator.git.secretName=flux-git-deploy \
-    --set helmOperator.createCRD="${create_crds}" \
     --set registry.excludeImage=* \
     --set-string ssh.known_hosts="${KNOWN_HOSTS}" \
     "${FLUX_ROOT_DIR}/chart/flux"
@@ -49,7 +42,7 @@ function install_flux_with_helm() {
 
 function uninstall_flux_with_helm() {
   helm delete --purge flux > /dev/null 2>&1
-  kubectl delete crd helmreleases.flux.weave.works > /dev/null 2>&1
+  kubectl delete crd helmreleases.fluxcd.io > /dev/null 2>&1
 }
 
 fluxctl_install_cmd="fluxctl install --git-url=ssh://git@gitsrv/git-server/repos/cluster.git --git-email=foo"