Cleanup unused env vars in dev scripts (#2187)

stackrox · Feb 10, 2025 · 309beb7 · 309beb7
1 parent 318647f
commit 309beb7
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 55 deletions.
diff --git a/dev/env/defaults/00-defaults.env b/dev/env/defaults/00-defaults.env
@@ -7,10 +7,6 @@ export DOCKER_DEFAULT="docker"
 export KIND_DEFAULT="kind"
 export CLUSTER_TYPE_DEFAULT=""
 
-export IMAGE_REGISTRY_DEFAULT="quay.io/rhacs-eng"
-STACKROX_VERSION_TAG="4.1.1" # Note: SCANNER_VERSION_DEFAULT needs to be in sync with this.
-export CENTRAL_VERSION_DEFAULT=$(echo "$STACKROX_VERSION_TAG" | sed -e 's/0-nightly/x-nightly/;')
-export SCANNER_VERSION_DEFAULT="2.30.0" # This one matches the above operator version tag.
 export STACKROX_OPERATOR_NAMESPACE_DEFAULT="rhacs"
 export FLEET_MANAGER_IMAGE_DEFAULT=""
 export ENABLE_DB_PORT_FORWARDING_DEFAULT="false"
@@ -33,21 +29,10 @@ export OCM_SERVICE_TOKEN_DEFAULT=""
 export OCM_ADDON_SERVICE_CLIENT_ID_DEFAULT=""
 export OCM_ADDON_SERVICE_CLIENT_SECRET_DEFAULT=""
 export OCM_ADDON_SERVICE_TOKEN_DEFAULT=""
-export SENTRY_KEY_DEFAULT=""
-export AWS_ACCESS_KEY_DEFAULT=""
-export AWS_ACCOUNT_ID_DEFAULT=""
-export AWS_SECRET_ACCESS_KEY_DEFAULT=""
-export SSO_CLIENT_ID_DEFAULT=""
-export SSO_CLIENT_SECRET_DEFAULT=""
-export OSD_IDP_SSO_CLIENT_ID_DEFAULT=""
-export OSD_IDP_SSO_CLIENT_SECRET_DEFAULT=""
 export ROUTE53_ACCESS_KEY_DEFAULT=""
 export ROUTE53_SECRET_ACCESS_KEY_DEFAULT=""
 export SPAWN_LOGGER_DEFAULT="false"
 export DUMP_LOGS_DEFAULT="false"
-export OPERATOR_SOURCE_DEFAULT=""
-export INSTALL_OLM_DEFAULT="false"
-export DOCKER_CONFIG_DEFAULT="${GITROOT}/.docker"
 export SKIP_TESTS_DEFAULT="false"
 export ENABLE_CENTRAL_EXTERNAL_CERTIFICATE_DEFAULT=false
 

diff --git a/dev/env/defaults/cluster-type-colima/env b/dev/env/defaults/cluster-type-colima/env
@@ -1,7 +1,5 @@
 export ENABLE_DB_PORT_FORWARDING_DEFAULT="true"
 export ENABLE_FM_PORT_FORWARDING_DEFAULT="true"
-export OPERATOR_SOURCE_DEFAULT="quay"
-export INSTALL_OLM_DEFAULT="false"
 
 if grep -q "runtime: docker" <(colima status 2>&1); then
   export DOCKER_HOST="unix://$HOME/.colima/docker.sock"

diff --git a/dev/env/defaults/cluster-type-docker/env b/dev/env/defaults/cluster-type-docker/env
@@ -1,6 +1,4 @@
 export ENABLE_DB_PORT_FORWARDING_DEFAULT="true"
 export ENABLE_FM_PORT_FORWARDING_DEFAULT="true"
-export OPERATOR_SOURCE_DEFAULT="quay"
-export INSTALL_OLM_DEFAULT="false"
 export ENABLE_EXTERNAL_CONFIG_DEFAULT="true"
 export AWS_AUTH_HELPER_DEFAULT="aws-saml"
diff --git a/dev/env/defaults/cluster-type-kind/env b/dev/env/defaults/cluster-type-kind/env
@@ -1,7 +1,5 @@
 export KIND="${KIND:-kind}"
 export ENABLE_DB_PORT_FORWARDING_DEFAULT="true"
 export ENABLE_FM_PORT_FORWARDING_DEFAULT="true"
-export OPERATOR_SOURCE_DEFAULT="quay"
-export INSTALL_OLM_DEFAULT="false"
 export ENABLE_EXTERNAL_CONFIG_DEFAULT="true"
 export AWS_AUTH_HELPER_DEFAULT="aws-saml"
diff --git a/dev/env/defaults/cluster-type-minikube/env b/dev/env/defaults/cluster-type-minikube/env
@@ -1,7 +1,5 @@
 export MINIKUBE="${MINIKUBE:-minikube}"
 export ENABLE_DB_PORT_FORWARDING_DEFAULT="true"
 export ENABLE_FM_PORT_FORWARDING_DEFAULT="true"
-export OPERATOR_SOURCE_DEFAULT="quay"
-export INSTALL_OLM_DEFAULT="false"
 export ENABLE_EXTERNAL_CONFIG_DEFAULT="true"
 export AWS_AUTH_HELPER_DEFAULT="aws-saml"
diff --git a/dev/env/defaults/cluster-type-openshift/env b/dev/env/defaults/cluster-type-openshift/env
@@ -1,5 +1,4 @@
 export KUBECTL_DEFAULT="oc"
-export INSTALL_OLM_DEFAULT="false"
 export ENABLE_FM_PORT_FORWARDING_DEFAULT="true"
 export INSTALL_OPENSHIFT_ROUTER_DEFAULT="false"
 export INSTALL_VERTICAL_POD_AUTOSCALER_DEFAULT="false"

diff --git a/dev/env/defaults/cluster-type-rancher-desktop/env b/dev/env/defaults/cluster-type-rancher-desktop/env
@@ -1,8 +1,6 @@
 export KUBECONF_CLUSTER_SERVER_OVERRIDE_DEFAULT="true"
 export ENABLE_DB_PORT_FORWARDING_DEFAULT="true"
 export ENABLE_FM_PORT_FORWARDING_DEFAULT="true"
-export OPERATOR_SOURCE_DEFAULT="quay"
-export INSTALL_OLM_DEFAULT="false"
 export RANCHER_DESKTOP_BIN=${RANCHER_DESKTOP_BIN:-"${HOME}/.rd/bin"}
 export KUBECTL_DEFAULT="${RANCHER_DESKTOP_BIN}/kubectl"
 export DOCKER_DEFAULT="${RANCHER_DESKTOP_BIN}/docker"

diff --git a/dev/env/scripts/lib.sh b/dev/env/scripts/lib.sh
@@ -81,11 +81,6 @@ init() {
     export ACSCS_NAMESPACE="${ACSCS_NAMESPACE:-$ACSCS_NAMESPACE_DEFAULT}"
     export DOCKER=${DOCKER:-$DOCKER_DEFAULT}
     export KIND=${KIND:-$KIND_DEFAULT}
-    export IMAGE_REGISTRY="${IMAGE_REGISTRY:-$IMAGE_REGISTRY_DEFAULT}"
-    IMAGE_REGISTRY_HOST=$(if [[ "$IMAGE_REGISTRY" =~ ^[^/]*\.[^/]*/ ]]; then echo "$IMAGE_REGISTRY" | cut -d / -f 1; fi)
-    export IMAGE_REGISTRY_HOST
-    export CENTRAL_VERSION="${CENTRAL_VERSION:-$CENTRAL_VERSION_DEFAULT}"
-    export SCANNER_VERSION="${SCANNER_VERSION:-$SCANNER_VERSION_DEFAULT}"
     export STACKROX_OPERATOR_NAMESPACE="${STACKROX_OPERATOR_NAMESPACE:-$STACKROX_OPERATOR_NAMESPACE_DEFAULT}"
     export INSTALL_OPENSHIFT_ROUTER="${INSTALL_OPENSHIFT_ROUTER:-$INSTALL_OPENSHIFT_ROUTER_DEFAULT}"
     export EXPOSE_OPENSHIFT_ROUTER="${EXPOSE_OPENSHIFT_ROUTER:-$EXPOSE_OPENSHIFT_ROUTER_DEFAULT}"
@@ -97,20 +92,10 @@ init() {
     export OCM_ADDON_SERVICE_CLIENT_ID=${OCM_ADDON_SERVICE_CLIENT_ID:-$OCM_ADDON_SERVICE_CLIENT_ID_DEFAULT}
     export OCM_ADDON_SERVICE_CLIENT_SECRET=${OCM_ADDON_SERVICE_CLIENT_SECRET:-$OCM_ADDON_SERVICE_CLIENT_SECRET_DEFAULT}
     export OCM_ADDON_SERVICE_TOKEN=${OCM_ADDON_SERVICE_TOKEN:-$OCM_ADDON_SERVICE_TOKEN_DEFAULT}
-    export SENTRY_KEY=${SENTRY_KEY:-$SENTRY_KEY_DEFAULT}
-    export AWS_ACCESS_KEY=${AWS_ACCESS_KEY:-$AWS_ACCESS_KEY_DEFAULT}
-    export AWS_ACCOUNT_ID=${AWS_ACCOUNT_ID:-$AWS_ACCOUNT_ID_DEFAULT}
-    export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY_DEFAULT}
-    export SSO_CLIENT_ID=${SSO_CLIENT_ID:-$SSO_CLIENT_ID_DEFAULT}
-    export SSO_CLIENT_SECRET=${SSO_CLIENT_SECRET:-$SSO_CLIENT_SECRET_DEFAULT}
-    export OSD_IDP_SSO_CLIENT_ID=${OSD_IDP_SSO_CLIENT_ID:-$OSD_IDP_SSO_CLIENT_ID_DEFAULT}
-    export OSD_IDP_SSO_CLIENT_SECRET=${OSD_IDP_SSO_CLIENT_SECRET:-$OSD_IDP_SSO_CLIENT_SECRET_DEFAULT}
     export ROUTE53_ACCESS_KEY=${ROUTE53_ACCESS_KEY:-$ROUTE53_ACCESS_KEY_DEFAULT}
     export ROUTE53_SECRET_ACCESS_KEY=${ROUTE53_SECRET_ACCESS_KEY:-$ROUTE53_SECRET_ACCESS_KEY_DEFAULT}
     export SPAWN_LOGGER=${SPAWN_LOGGER:-$SPAWN_LOGGER_DEFAULT}
     export DUMP_LOGS=${DUMP_LOGS:-$DUMP_LOGS_DEFAULT}
-    export OPERATOR_SOURCE=${OPERATOR_SOURCE:-$OPERATOR_SOURCE_DEFAULT}
-    export INSTALL_OLM=${INSTALL_OLM:-$INSTALL_OLM_DEFAULT}
     export ENABLE_DB_PORT_FORWARDING=${ENABLE_DB_PORT_FORWARDING:-$ENABLE_DB_PORT_FORWARDING_DEFAULT}
     export ENABLE_FM_PORT_FORWARDING=${ENABLE_FM_PORT_FORWARDING:-$ENABLE_FM_PORT_FORWARDING_DEFAULT}
     export FLEETSHARD_SYNC_RESOURCES=${FLEETSHARD_SYNC_RESOURCES:-$FLEETSHARD_SYNC_RESOURCES_DEFAULT}
@@ -162,10 +147,6 @@ KUBECTL: ${KUBECTL}
 ACSCS_NAMESPACE: ${ACSCS_NAMESPACE}
 DOCKER: ${DOCKER}
 KIND: ${KIND}
-IMAGE_REGISTRY: ${IMAGE_REGISTRY}
-IMAGE_REGISTRY_HOST: ${IMAGE_REGISTRY_HOST}
-CENTRAL_VERSION: ${CENTRAL_VERSION}
-SCANNER_VERSION: ${SCANNER_VERSION}
 STACKROX_OPERATOR_NAMESPACE: ${STACKROX_OPERATOR_NAMESPACE}
 INSTALL_OPENSHIFT_ROUTER: ${INSTALL_OPENSHIFT_ROUTER}
 EXPOSE_OPENSHIFT_ROUTER: ${EXPOSE_OPENSHIFT_ROUTER}
@@ -178,20 +159,10 @@ ARGOCD_TENANT_APP_TARGET_REVISION: ${ARGOCD_TENANT_APP_TARGET_REVISION}
 OCM_SERVICE_CLIENT_ID: ********
 OCM_SERVICE_CLIENT_SECRET: ********
 OCM_SERVICE_TOKEN: ********
-SENTRY_KEY: ********
-AWS_ACCESS_KEY: ********
-AWS_ACCOUNT_ID: ********
-AWS_SECRET_ACCESS_KEY: ********
-SSO_CLIENT_ID: ********
-SSO_CLIENT_SECRET: ********
-OSD_IDP_SSO_CLIENT_ID: ********
-OSD_IDP_SSO_CLIENT_SECRET: ********
 ROUTE53_ACCESS_KEY: ********
 ROUTE53_SECRET_ACCESS_KEY: ********
 SPAWN_LOGGER: ${SPAWN_LOGGER}
 DUMP_LOGS: ${DUMP_LOGS}
-OPERATOR_SOURCE: ${OPERATOR_SOURCE}
-INSTALL_OLM: ${INSTALL_OLM}
 ENABLE_DB_PORT_FORWARDING: ${ENABLE_DB_PORT_FORWARDING}
 ENABLE_FM_PORT_FORWARDING: ${ENABLE_FM_PORT_FORWARDING}
 FLEETSHARD_SYNC_RESOURCES: ${FLEETSHARD_SYNC_RESOURCES}