From 85b746dd4cc40e5049fe30daade8fb930a51885b Mon Sep 17 00:00:00 2001
From: Mike Kolesnik <mkolesni@redhat.com>
Date: Tue, 5 Jul 2022 11:36:31 +0300
Subject: [PATCH] Use Shipyard's deployment of helm

Instead of using a copy of the deploy file, use Shipyard's deploy as it
could (and does) diverge.

This also obviates the need for a copy of `Dockerfile.dapper` which
can now be taken directly from Shipyard.

Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
---
 .gitignore        |  1 +
 Dockerfile.dapper | 18 -----------
 Makefile          |  1 +
 deploy_helm       | 76 -----------------------------------------------
 4 files changed, 2 insertions(+), 94 deletions(-)
 delete mode 100644 Dockerfile.dapper
 delete mode 100644 deploy_helm

diff --git a/.gitignore b/.gitignore
index eb49691..9229891 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 .shflags
 *.tgz
 Makefile.dapper
+Dockerfile.*
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
deleted file mode 100644
index 0f598bf..0000000
--- a/Dockerfile.dapper
+++ /dev/null
@@ -1,18 +0,0 @@
-ARG BASE_BRANCH
-FROM quay.io/submariner/shipyard-dapper-base:${BASE_BRANCH}
-
-ARG DAPPER_HOST_ARCH
-ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} \
-    DAPPER_ENV="REPO TAG QUAY_USERNAME QUAY_PASSWORD GITHUB_SHA MAKEFLAGS CLUSTERS_ARGS DEPLOY_ARGS E2E_ARGS RELEASE_ARGS" \
-    DAPPER_SOURCE=/go/src/github.com/submariner-io/submariner-charts DAPPER_DOCKER_SOCKET=true
-ENV DAPPER_OUTPUT=${DAPPER_SOURCE}/output PATH=${DAPPER_SOURCE}/bin/:${PATH}
-
-WORKDIR ${DAPPER_SOURCE}
-
-RUN git config --global --add safe.directory ${DAPPER_SOURCE}
-
-# Override the Helm deployment scripts
-COPY deploy_helm /opt/shipyard/scripts/lib/
-
-ENTRYPOINT ["/opt/shipyard/scripts/entry"]
-CMD ["sh"]
diff --git a/Makefile b/Makefile
index 980516f..1e73cd0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 BASE_BRANCH ?= devel
 export BASE_BRANCH
+export HELM_REPO_LOCATION=.
 
 ifneq (,$(DAPPER_HOST_ARCH))
 
diff --git a/deploy_helm b/deploy_helm
deleted file mode 100644
index d26b88f..0000000
--- a/deploy_helm
+++ /dev/null
@@ -1,76 +0,0 @@
-# shellcheck shell=bash
-# shellcheck source=scripts/shared/lib/source_only
-. "${BASH_SOURCE%/*}"/source_only
-
-### Constants ###
-
-readonly SUBMARINER_BROKER_NS=submariner-k8s-broker
-readonly SUBMARINER_PSK=$(LC_CTYPE=C tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 64 | head -n 1)
-
-### Functions ###
-
-function deploytool_prereqs() {
-    helm version
-}
-
-function setup_broker() {
-    if kubectl get crd clusters.submariner.io > /dev/null 2>&1; then
-        echo "Submariner CRDs already exist, skipping broker creation..."
-    else
-        echo "Installing submariner broker..."
-        # shellcheck disable=SC2086 # Split on purpose
-        helm install "${SUBMARINER_BROKER_NS}" ./submariner-k8s-broker \
-             --create-namespace \
-             --kube-context "${cluster}" \
-             --namespace "${SUBMARINER_BROKER_NS}" \
-             ${deploytool_broker_args}
-    fi
-
-    submariner_broker_url=$(kubectl -n default get endpoints kubernetes -o jsonpath="{.subsets[0].addresses[0].ip}:{.subsets[0].ports[?(@.name=='https')].port}")
-    submariner_broker_ca=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data['ca\.crt']}")
-    submariner_broker_token=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data.token}"|base64 --decode)
-}
-
-function helm_install_subm() {
-    local crd_create=false
-    [[ "${cluster}" = "${broker}" ]] || crd_create=true
-
-    if kubectl wait --for=condition=Ready pods -l app=submariner-operator -n "${SUBM_NS}" --timeout=60s > /dev/null 2>&1; then
-        echo "Submariner already installed, skipping installation..."
-        return
-    fi
-
-    echo "Installing Submariner..."
-    # shellcheck disable=SC2086 # Split on purpose
-    helm --kube-context "${cluster}" install submariner-operator \
-        ./submariner-operator \
-        --create-namespace \
-        --namespace "${SUBM_NS}" \
-        --set ipsec.psk="${SUBMARINER_PSK}" \
-        --set broker.server="${submariner_broker_url}" \
-        --set broker.token="${submariner_broker_token}" \
-        --set broker.namespace="${SUBMARINER_BROKER_NS}" \
-        --set broker.ca="${submariner_broker_ca}" \
-        --set broker.globalnet="${globalnet}" \
-        --set submariner.serviceDiscovery="${service_discovery}" \
-        --set submariner.cableDriver="${cable_driver}" \
-        --set submariner.clusterId="${cluster}" \
-        --set submariner.clusterCidr="${cluster_CIDRs[$cluster]}" \
-        --set submariner.serviceCidr="${service_CIDRs[$cluster]}" \
-        --set submariner.globalCidr="${global_CIDRs[$cluster]}" \
-        --set serviceAccounts.globalnet.create="${globalnet}" \
-        --set serviceAccounts.lighthouseAgent.create="${service_discovery}" \
-        --set serviceAccounts.lighthouseCoreDns.create="${service_discovery}" \
-        --set submariner.natEnabled="false" \
-        --set operator.image.repository="localhost:5000/submariner-operator" \
-        --set operator.image.tag="local" \
-        --set operator.image.pullPolicy="IfNotPresent" \
-        --set submariner.images.repository="localhost:5000" \
-        --set submariner.images.tag="local" \
-        --set brokercrds.create="${crd_create}" \
-        ${deploytool_submariner_args}
-}
-
-function install_subm_all_clusters() {
-    run_subm_clusters helm_install_subm
-}