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.

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

ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e: Push AWS-specific default BASE_DOMAIN down into the template #5151

Conversation

wking
Copy link
Member

@wking wking commented Sep 23, 2019

We want to set per-platform defaults to make life easier for folks consuming these templates.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 23, 2019
@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 23, 2019
@jstuever
Copy link
Contributor

/test pj-rehearse

@wking wking force-pushed the platform-specific-base-domain-defaults branch 7 times, most recently from 958b34e to 362f252 Compare September 23, 2019 22:18
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 23, 2019
…i-e2e: Push AWS-specific default base domain down into the template

We want to set per-platform defaults to make life easier for folks
consuming these templates.  := is in POSIX [1].  The new lowercase
form is because ${BASE_DOMAIN} expansion is happening at the
Go-template level, so attempting to do:

  echo "Base domain: ${BASE_DOMAIN:=origin-ci-int-aws.dev.rhcloud.com}"
  echo "FIXME: testing BASE_DOMAIN: ${BASE_DOMAIN}"

results in [2]:

  Base domain: origin-ci-int-aws.dev.rhcloud.com
  FIXME: testing BASE_DOMAIN:

It is a bit strange to have vSphere using a domain that includes
"aws", but it seems to work [3]:

  $ curl -s https://storage.googleapis.com/origin-ci-test/logs/canary-openshift-ocp-installer-e2e-vsphere-upi-4.2/180/artifacts/e2e-vsphere-upi/installer/.openshift_install.log | grep aws | head -n1
  time="2019-09-23T17:21:17Z" level=info msg="Waiting up to 30m0s for the Kubernetes API at https://api.ci-op-4jhq8mjx-f1a95.origin-ci-int-aws.dev.rhcloud.com:6443..."

Clayton says this is because we're currently running our vSphere CI on
AWS, which makes sense.

[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02
[2]: https://prow.svc.ci.openshift.org/view/gcs/origin-ci-test/pr-logs/pull/openshift_release/5151/rehearse-5151-pull-ci-openshift-installer-master-e2e-aws-upi/4
[3]: https://prow.svc.ci.openshift.org/view/gcs/origin-ci-test/logs/canary-openshift-ocp-installer-e2e-vsphere-upi-4.2/180
@wking wking force-pushed the platform-specific-base-domain-defaults branch from 362f252 to 43e08e7 Compare September 23, 2019 23:48
@openshift-ci-robot
Copy link
Contributor

@wking: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/rehearse/openshift/installer/master/e2e-vsphere 43e08e7 link /test pj-rehearse
ci/rehearse/openshift/installer/master/e2e-aws-upi 43e08e7 link /test pj-rehearse
ci/prow/pj-rehearse 43e08e7 link /test pj-rehearse

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@wking wking changed the title WIP: ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e: Push AWS-specific default BASE_DOMAIN down into the template ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e: Push AWS-specific default BASE_DOMAIN down into the template Sep 24, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 24, 2019
@wking
Copy link
Member Author

wking commented Sep 24, 2019

Works with base_domain. @jstuever, can you /lgtm if it looks good to you?

@jstuever
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 25, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jstuever, 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jstuever jstuever mentioned this pull request Sep 25, 2019
@openshift-merge-robot openshift-merge-robot merged commit 9dfbc0a into openshift:master Sep 25, 2019
@openshift-ci-robot
Copy link
Contributor

@wking: Updated the following 2 configmaps:

  • prow-job-cluster-launch-installer-upi-e2e configmap in namespace ci using the following files:
    • key cluster-launch-installer-upi-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
  • prow-job-cluster-launch-installer-upi-e2e configmap in namespace ci-stg using the following files:
    • key cluster-launch-installer-upi-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml

In response to this:

We want to set per-platform defaults to make life easier for folks consuming these templates.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@wking wking deleted the platform-specific-base-domain-defaults branch September 25, 2019 02:52
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
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants