Changed the default value for OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY to true

openshift · Feb 28, 2025 · ccd11a9 · ccd11a9
1 parent eb9cfdf
commit ccd11a9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/ci-operator/step-registry/ipi/aws/pre/publicsubnets/ipi-aws-pre-publicsubnets-chain.yaml b/ci-operator/step-registry/ipi/aws/pre/publicsubnets/ipi-aws-pre-publicsubnets-chain.yaml
@@ -1,7 +1,6 @@
 chain:
   as: ipi-aws-pre-publicsubnets
   steps:
-  - chain: ipi-conf-aws-publicsubnets
   - chain: ipi-install
   documentation: |-
     The IPI setup step contains all steps that provision an OpenShift cluster

diff --git a/ci-operator/step-registry/ipi/conf/aws/publicsubnets/ipi-conf-aws-publicsubnets-commands.sh b/ci-operator/step-registry/ipi/conf/aws/publicsubnets/ipi-conf-aws-publicsubnets-commands.sh
@@ -4,6 +4,11 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
+if [[ "${OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY:-true}" != "true" ]]
+then
+	return
+fi
+
 export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
 
 function join_by { local IFS="$1"; shift; echo "$*"; }

diff --git a/ci-operator/step-registry/ipi/install/install/aws/ipi-install-install-aws-ref.yaml b/ci-operator/step-registry/ipi/install/install/aws/ipi-install-install-aws-ref.yaml
@@ -41,7 +41,7 @@ ref:
   - name: EDGE_NODE_WORKER_ASSIGN_PUBLIC_IP
     default: "no"
   - name: OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY
-    default: ""
+    default: "true"
     documentation: "Whether to use public only subnets. Implies no NAT gateways. Requires a VPC to be configured prior to install"
   - name: TF_LOG
     default: "INFO"

diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml b/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
@@ -56,7 +56,7 @@ ref:
     default: "false"
     documentation:  "Use AWS Spot Instances for *master* nodes. Set to 'true' to opt into spot instances. Explicitly set to 'false' to opt out. Leave unset for the default, which may change. Note that spot masters are only supported when installing with a) CAPI; or b) newer installer versions (see https://github.com/openshift/installer/pull/8349). A preflight check will fail if this variable is set to 'true' for an unsupported configuration."
   - name: OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY
-    default: ""
+    default: "true"
     documentation: "Whether to use only public subnets for AWS. Implies no NAT Gateways. Requires a VPC to be configured prior to install."
   dependencies:
   - name: "release:latest"

diff --git a/ci-operator/step-registry/ipi/install/ipi-install-chain.yaml b/ci-operator/step-registry/ipi/install/ipi-install-chain.yaml
@@ -4,6 +4,7 @@ chain:
   - ref: ipi-install-rbac
   - ref: openshift-cluster-bot-rbac
   - ref: ipi-install-hosted-loki
+  - ref: ipi-conf-aws-publicsubnets 
   - ref: ipi-install-install
   - ref: ipi-install-times-collection
   - ref: nodes-readiness