Remove deploytool_.*_args

These aren't really used and are just dead code now.

Signed-off-by: Mike Kolesnik <[email protected]>

Author: mkolesnik

scripts/shared/deploy.sh

@@ -5,8 +5,6 @@
 source "${SCRIPTS_DIR}/lib/shflags"
 DEFINE_string 'settings' '' "Settings YAML file to customize cluster deployments"
 DEFINE_string 'deploytool' 'operator' 'Tool to use for deploying (operator/helm/bundle/ocm)'
-DEFINE_string 'deploytool_broker_args' '' 'Any extra arguments to pass to the deploytool when deploying the broker'
-DEFINE_string 'deploytool_submariner_args' '' 'Any extra arguments to pass to the deploytool when deploying submariner'
 DEFINE_boolean 'globalnet' false "Deploy with operlapping CIDRs (set to 'true' to enable)"
 DEFINE_boolean 'service_discovery' false "Enable multicluster service discovery (set to 'true' to enable)"
 DEFINE_string 'timeout' '5m' "Timeout flag to pass to kubectl when waiting (e.g. 30s)"
@@ -20,14 +18,12 @@ eval set -- "${FLAGS_ARGV}"
 [[ "${FLAGS_globalnet}" = "${FLAGS_TRUE}" ]] && globalnet=true || globalnet=false
 [[ "${FLAGS_service_discovery}" = "${FLAGS_TRUE}" ]] && service_discovery=true || service_discovery=false
 deploytool="${FLAGS_deploytool}"
-deploytool_broker_args="${FLAGS_deploytool_broker_args}"
-deploytool_submariner_args="${FLAGS_deploytool_submariner_args}"
 settings="${FLAGS_settings}"
 timeout="${FLAGS_timeout}"
 image_tag="${FLAGS_image_tag}"
 cable_driver="${FLAGS_cable_driver}"
 
-echo "Running with: globalnet=${globalnet@Q}, deploytool=${deploytool@Q}, deploytool_broker_args=${deploytool_broker_args@Q}, deploytool_submariner_args=${deploytool_submariner_args@Q}, settings=${settings@Q}, timeout=${timeout}, image_tag=${image_tag}, cable_driver=${cable_driver}, service_discovery=${service_discovery}"
+echo "Running with: globalnet=${globalnet@Q}, deploytool=${deploytool@Q}, settings=${settings@Q}, timeout=${timeout}, image_tag=${image_tag}, cable_driver=${cable_driver}, service_discovery=${service_discovery}"
 
 set -em
 

scripts/shared/lib/deploy_helm

@@ -19,8 +19,7 @@ function setup_broker() {
              submariner-latest/submariner-k8s-broker \
              --create-namespace \
              --kube-context "${cluster}" \
-             --namespace "${BROKER_NAMESPACE}" \
-             ${deploytool_broker_args}
+             --namespace "${BROKER_NAMESPACE}"
     fi
 
     submariner_broker_url=$(kubectl -n default get endpoints kubernetes -o jsonpath="{.subsets[0].addresses[0].ip}:{.subsets[0].ports[?(@.name=='https')].port}")
@@ -64,8 +63,7 @@ function helm_install_subm() {
         --set operator.image.pullPolicy="IfNotPresent" \
         --set submariner.images.repository="localhost:5000" \
         --set submariner.images.tag="local" \
-        --set brokercrds.create="${crd_create}" \
-        ${deploytool_submariner_args}
+        --set brokercrds.create="${crd_create}"
 }
 
 function install_subm_all_clusters() {

scripts/shared/lib/deploy_operator

@@ -40,8 +40,7 @@ function setup_broker() {
                --kubeconfig "${KUBECONFIGS_DIR}/kind-config-$cluster" \
                ${subctlrepver} \
                ${gn} \
-               ${sd} \
-               ${deploytool_broker_args}
+               ${sd}
     )
 }
 
@@ -72,7 +71,6 @@ function subctl_install_subm() {
                 --globalnet-cidr "${global_CIDRs[$cluster]}" \
                 --natt=false \
                 --cable-driver "${cable_driver}" \
-                ${deploytool_submariner_args} \
                 ${cidr_args} \
                 "${OUTPUT_DIR}"/broker-info.subm