Skip to content

Let cluster-bot use regular ci aws account for hypershift guest clusters #32613

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

Merged
openshift-merge-robot merged 1 commit into from
Sep 27, 2022
Merged

Let cluster-bot use regular ci aws account for hypershift guest clusters #32613

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: 1 addition & 0 deletions ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2674,6 +2674,7 @@ periodics:
HYPERSHIFT_NODE_COUNT: 2
HYPERSHIFT_ZONES: "us-east-1a"
HYPERSHIFT_NAMESPACE: "cluster-bot"
HYPERSHIFT_GUEST_INFRA_OCP_ACCOUNT: "true"
Copy link
Copy Markdown
Contributor

@csrwng csrwng Sep 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we also set this var for our other jobs like the presubmits?

Copy link
Copy Markdown
Member Author

@enxebre enxebre Sep 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sgtm, I was wanting to merge this one first, test it, then extend it

Copy link
Copy Markdown
Member Author

@enxebre enxebre Sep 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I'm thinking we can change it here for some or the others and the reharse would tell us

test:
- ref: clusterbot-wait
cluster_profile: hypershift
Expand Down
10 changes: 9 additions & 1 deletion ...setup-nested-management-cluster/hypershift-aws-setup-nested-management-cluster-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,21 @@ chain:
- name: HYPERSHIFT_ZONES
default: "us-east-1a,us-east-1b,us-east-1c"
documentation: "The zones where to create NodePools"
- name: HYPERSHIFT_GUEST_INFRA_OCP_ACCOUNT
default: "false"
documentation: "Whether to use the generic CI account or the HyperShift OSD account for the guest clusters infra. For the infra created for the clusters. E.g. For cluster-bot we use the generic CI account"
commands: |-
AWS_GUEST_INFRA_CREDENTIALS_FILE="/etc/hypershift-ci-jobs-awscreds/credentials"
if [[ "HYPERSHIFT_GUEST_INFRA_OCP_ACCOUNT" == "true" ]]; then
AWS_GUEST_INFRA_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
fi

export KUBECONFIG=/etc/hypershift-kubeconfig/hypershift-ops-admin.kubeconfig
CLUSTER_NAME="$(echo -n $PROW_JOB_ID|sha256sum|cut -c-20)-mgmt"
echo "Creating management cluster ${CLUSTER_NAME} with $((${HYPERSHIFT_NODE_COUNT} * 3)) nodes"
bin/hypershift create cluster aws \
--pull-secret=/etc/ci-pull-credentials/.dockerconfigjson \
--aws-creds=/etc/hypershift-ci-jobs-awscreds/credentials \
--aws-creds=${AWS_GUEST_INFRA_CREDENTIALS_FILE} \
--additional-tags="expirationDate=$(date -d '4 hours' --iso=minutes --utc)" \
--name=${CLUSTER_NAME} \
--region=us-east-1 \
Expand Down