mirror of
https://github.com/submariner-io/submariner-charts.git
synced 2026-09-21 12:40:34 +00:00
Switch to Helm v3
This allows us to deploy v1 CRDs such as the upstream MCS API CRDs. Fixes: #47 Signed-off-by: Stephen Kitt <skitt@redhat.com>
This commit is contained in:
committed by
Miguel Angel Ajo Pelayo
parent
44374a709c
commit
5906cfb3dc
+6
-19
@@ -9,22 +9,8 @@ readonly SUBMARINER_PSK=$(LC_CTYPE=C tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w
|
||||
|
||||
### Functions ###
|
||||
|
||||
function install_helm() {
|
||||
if kubectl -n kube-system rollout status deploy/tiller-deploy --timeout=3s > /dev/null 2>&1; then
|
||||
echo "Helm already installed, skipping helm installation..."
|
||||
return
|
||||
fi
|
||||
|
||||
echo "Installing helm..."
|
||||
kubectl -n kube-system create serviceaccount tiller
|
||||
kubectl create clusterrolebinding tiller --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
|
||||
helm --kube-context "${cluster}" init --service-account tiller
|
||||
kubectl -n kube-system rollout status deploy/tiller-deploy --timeout=30s
|
||||
}
|
||||
|
||||
function deploytool_prereqs() {
|
||||
helm init --client-only
|
||||
run_all_clusters install_helm
|
||||
helm version
|
||||
}
|
||||
|
||||
function setup_broker() {
|
||||
@@ -33,9 +19,9 @@ function setup_broker() {
|
||||
else
|
||||
echo "Installing submariner broker..."
|
||||
# shellcheck disable=SC2086 # Split on purpose
|
||||
helm install ./submariner-k8s-broker \
|
||||
helm install "${SUBMARINER_BROKER_NS}" ./submariner-k8s-broker \
|
||||
--create-namespace \
|
||||
--kube-context "${cluster}" \
|
||||
--name "${SUBMARINER_BROKER_NS}" \
|
||||
--namespace "${SUBMARINER_BROKER_NS}" \
|
||||
${deploytool_broker_args}
|
||||
fi
|
||||
@@ -56,8 +42,9 @@ function helm_install_subm() {
|
||||
|
||||
echo "Installing Submariner..."
|
||||
# shellcheck disable=SC2086 # Split on purpose
|
||||
helm --kube-context "${cluster}" install ./submariner-operator \
|
||||
--name submariner-operator \
|
||||
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}" \
|
||||
|
||||
Reference in New Issue
Block a user