Skip to content

Commit 32fabc6

Browse files
author
Hector Vido
committed
Changed the default value for OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY to true
1 parent eb9cfdf commit 32fabc6

File tree

5 files changed

+15
-4
lines changed

5 files changed

+15
-4
lines changed

ci-operator/step-registry/ipi/aws/pre/publicsubnets/ipi-aws-pre-publicsubnets-chain.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
chain:
22
as: ipi-aws-pre-publicsubnets
33
steps:
4-
- chain: ipi-conf-aws-publicsubnets
54
- chain: ipi-install
65
documentation: |-
76
The IPI setup step contains all steps that provision an OpenShift cluster

ci-operator/step-registry/ipi/conf/aws/publicsubnets/ipi-conf-aws-publicsubnets-commands.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,18 @@ set -o nounset
44
set -o errexit
55
set -o pipefail
66

7-
export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
7+
if [[ "${OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY:-true}" != "true" ]]
8+
then
9+
return
10+
fi
11+
12+
if [[ -f "${SHARED_DIR}/aws_minimal_permission" ]]; then
13+
echo "Setting AWS credential with minimal permision for installer"
14+
export AWS_SHARED_CREDENTIALS_FILE=${SHARED_DIR}/aws_minimal_permission
15+
else
16+
export AWS_SHARED_CREDENTIALS_FILE=${CLUSTER_PROFILE_DIR}/.awscred
17+
fi
18+
#export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
819

920
function join_by { local IFS="$1"; shift; echo "$*"; }
1021

ci-operator/step-registry/ipi/install/install/aws/ipi-install-install-aws-ref.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ref:
4141
- name: EDGE_NODE_WORKER_ASSIGN_PUBLIC_IP
4242
default: "no"
4343
- name: OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY
44-
default: ""
44+
default: "true"
4545
documentation: "Whether to use public only subnets. Implies no NAT gateways. Requires a VPC to be configured prior to install"
4646
- name: TF_LOG
4747
default: "INFO"

ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ref:
5656
default: "false"
5757
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."
5858
- name: OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY
59-
default: ""
59+
default: "true"
6060
documentation: "Whether to use only public subnets for AWS. Implies no NAT Gateways. Requires a VPC to be configured prior to install."
6161
dependencies:
6262
- name: "release:latest"

ci-operator/step-registry/ipi/install/ipi-install-chain.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ chain:
44
- ref: ipi-install-rbac
55
- ref: openshift-cluster-bot-rbac
66
- ref: ipi-install-hosted-loki
7+
- ref: ipi-conf-aws-publicsubnets
78
- ref: ipi-install-install
89
- ref: ipi-install-times-collection
910
- ref: nodes-readiness

0 commit comments

Comments
 (0)