pkg/steps/clusterinstall/template: Get region from Boskos lease #1527
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Like openshift/release@7aa198b3c7 (ci-operator/step-registry/ipi/conf/azure: Get region from Boskos lease, 2020-10-14, openshift/release#12584), but for AWS and GCP here too, now that we have evidence that the approach is working. I'm keeping a switch for AWS to give folks a pattern for selecting zones, if AWS breaks a zone in a particular region. We should probably distribute that (and the shared subnets, for shared-subnet tests?) via leases as well, but baby steps.
openshift-ci-robot
added
the
approved
alvaroaleman
approved these changes
Dec 11, 2020
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alvaroaleman, wking The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
breaking-changes is suggesting: - args:
+ - --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-password-file=/etc/report/password.txt
- --report-username=ci
@@ -107,6 +112,9 @@ presubmits:
requests:
cpu: 10m
volumeMounts:
+ - mountPath: /secrets/gcs
+ name: gcs-credentials
+ readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: trueand similar things I don't understand at all. Maybe it's a flake of some sort? /retest |
|
breaking-changes failed again the same way. Until we figure out what's going on there, hold to keep the retest bot from smashing us into the wall over and over: /hold |
openshift-ci-robot
added
the
do-not-merge/hold
|
/test breaking-changes |
|
/retest |
|
Been a few days since the last attempt; let's see if breaking-changes is happier now: /retest |
|
Green now. /hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
wking
added a commit
to wking/openshift-release
that referenced
this pull request
Dec 14, 2020
Like 7aa198b (ci-operator/step-registry/ipi/conf/azure: Get region from Boskos lease, 2020-10-14, openshift#12584), but for AWS. This sets us up for sharding GCP by region, if we ever need that (e.g. GCP has an outage in one region). I'm leaving ci-operator/templates alone; hopefully those will be gone soon. I've already updated ci-tools with openshift/ci-tools@00ebab17e1 (pkg/steps/clusterinstall/template: Get region from Boskos lease, 2020-12-11, openshift/ci-tools#1527). I still wish the end-to-end suite pulled the region out of the cluster itself, but until it does, lean on the Infrastructure status [1] like we've been doing for AWS since bf0a271 (AWS e2e provider should identify zone and master and multizone, 2019-01-05, openshift#2507). [1]: https://github.com/openshift/api/blob/164a2fb63b5f12918c439a5a0a768aa911bcad99/config/v1/types_infrastructure.go#L327-L328
wking
added a commit
to wking/ci-tools
that referenced
this pull request
Dec 14, 2020
I still wish the end-to-end suite pulled the region out of the cluster itself, but until it does, lean on the Infrastructure status [1] like we've been doing for AWS since openshift/release@bf0a271f5c (AWS e2e provider should identify zone and master and multizone, 2019-01-05, openshift/release#2507). The hard-coding I'm replacing here was fine until the GCP region became dynamic in 00ebab1 (pkg/steps/clusterinstall/template: Get region from Boskos lease, 2020-12-11, openshift#1527). [1]: https://github.com/openshift/api/blob/164a2fb63b5f12918c439a5a0a768aa911bcad99/config/v1/types_infrastructure.go#L327-L328
wking
added a commit
to wking/ci-tools
that referenced
this pull request
Dec 15, 2020
I'd attempted to consume this as an environment variable in 00ebab1 (pkg/steps/clusterinstall/template: Get region from Boskos lease, 2020-12-11, openshift#1527), but it's failing in CI with [1]: 2020/12/15 18:04:36 Running pod e2e-aws-upgrade Installing from initial release registry.svc.ci.openshift.org/ocp/release:4.5.23 /bin/bash: line 59: LEASED_RESOURCE: unbound variable With this commit, I'm making it a template parameter, so it will be filled in by Go template expansion (and never be an environment variable within the test pod). [1]: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.5-to-4.6/1338903713728696320#1:build-log.txt%3A29
wking
added a commit
to wking/openshift-release
that referenced
this pull request
Dec 15, 2020
Like 7aa198b (ci-operator/step-registry/ipi/conf/azure: Get region from Boskos lease, 2020-10-14, openshift#12584), but for AWS. I'm keeping a switch for AWS to give folks a pattern for selecting zones, if AWS breaks a zone in a particular region. We should probably distribute that (and the shared subnets, for shared-subnet tests?) via leases as well, but baby steps. I'm leaving ci-operator/templates alone; hopefully those will be gone soon. I've already updated ci-tools with openshift/ci-tools@00ebab17e1 (pkg/steps/clusterinstall/template: Get region from Boskos lease, 2020-12-11, openshift/ci-tools#1527). I'm also normalizing to uppercase shell variables, now that we are no longer constrained by Go template expansion. Hmm, at least that's why I thought the variables used to be lowercase, see 43e08e7 (ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e: Push AWS-specific default base domain down into the template, 2019-09-23, openshift#5151). But looking at the templates when de3de20 (step-registry: add configure and install IPI steps, 2020-01-14, openshift#6708), I'm now not sure why these step commands were using lowercase variable names.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Like openshift/release@7aa198b3c7 (openshift/release#12584), but for AWS and GCP here too, now that we have evidence that the approach is working.
I'm keeping a switch for AWS to give folks a pattern for selecting zones, if AWS breaks a zone in a particular region. We should probably distribute that (and the shared subnets, for shared-subnet tests?) via leases as well, but baby steps.