Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DPTP-4342] Changed OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY to true #62176

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[DPTP-4342] Changed OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY to true #62176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ci-operator/step-registry/ipi/aws/pre/publicsubnets/ipi-aws-pre-publicsubnets-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
13 changes: 12 additions & 1 deletion ci-operator/step-registry/ipi/conf/aws/publicsubnets/ipi-conf-aws-publicsubnets-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,18 @@ set -o nounset
set -o errexit
set -o pipefail

export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
if [[ "${OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY:-true}" != "true" ]]
then
return
fi

if [[ -f "${SHARED_DIR}/aws_minimal_permission" ]]; then
echo "Setting AWS credential with minimal permision for installer"
export AWS_SHARED_CREDENTIALS_FILE=${SHARED_DIR}/aws_minimal_permission
else
export AWS_SHARED_CREDENTIALS_FILE=${CLUSTER_PROFILE_DIR}/.awscred
fi
#export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"

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

Expand Down
2 changes: 1 addition & 1 deletion ci-operator/step-registry/ipi/install/install/aws/ipi-install-install-aws-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions ci-operator/step-registry/ipi/install/ipi-install-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down