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

hack/build: Pin to RHCOS 400.7.20190306.0 #1407

Merged
merged 1 commit into from
Mar 13, 2019

Conversation

wking
Copy link
Member

@wking wking commented Mar 12, 2019

@smarterclayton pushed release:4.0.0-0.nightly-2019-03-04-234414 to quay.io/openshift-release-dev/ocp-release:4.0.0-0.7. Extracting the associated RHCOS build:

$ oc adm release info --pullspecs quay.io/openshift-release-dev/ocp-release:4.0.0-0.7 | grep machine-os-content
  machine-os-content                            quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:399582f711226ab1a0e76d8928ec55436dea9f8dc60976c10790d308b9d92181
$ oc image info quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:399582f711226ab1a0e76d8928ec55436dea9f8dc60976c10790d308b9d92181 | grep version
            version=47.330

I'd like to be pulling that version out of the release image at install-time (#1286), but that PR isn't green yet, so hard-coding here is a quick fix.

CC @abhinavdahiya, @cgwalters

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 12, 2019
@abhinavdahiya
Copy link
Contributor

/approve

hack/build.sh Outdated Show resolved Hide resolved
@cgwalters
Copy link
Member

Very short term this is OK but soon we will need a newer version to get authenticated pivots to work.

This is the most recent RHCOS:

  $ curl -s https://releases-rhcos.svc.ci.openshift.org/storage/releases/maipo/builds.json | jq '{"latest": .builds[0], timestamp}'
  {
    "latest": "400.7.20190306.0",
    "timestamp": "2019-03-06T22:24:53Z"
  }

I'd prefer to pull this from the release image:

  $ oc adm release info --pullspecs quay.io/openshift-release-dev/ocp-release:4.0.0-0.7 | grep machine-os-content
    machine-os-content                            quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:399582f711226ab1a0e76d8928ec55436dea9f8dc60976c10790d308b9d92181
  $ oc image info quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:399582f711226ab1a0e76d8928ec55436dea9f8dc60976c10790d308b9d92181 | grep version
              version=47.330

But [1] isn't green yet, so hard-coding here is a quick fix.

Supported regions:

  $ curl -s https://releases-rhcos.svc.ci.openshift.org/storage/releases/maipo/400.7.20190306.0/meta.json | jq -r '.amis[] | .name'
  ap-northeast-1
  ap-northeast-2
  ap-south-1
  ap-southeast-1
  ap-southeast-2
  ca-central-1
  eu-central-1
  eu-west-1
  eu-west-2
  eu-west-3
  sa-east-1
  us-east-1
  us-east-2
  us-west-1
  us-west-2

[1]: openshift#1286
@wking wking changed the title hack/build: Pin to RHCOS 47.330 hack/build: Pin to RHCOS 400.7.20190306.0 Mar 12, 2019
@wking
Copy link
Member Author

wking commented Mar 12, 2019

Very short term this is OK but soon we will need a newer version to get authenticated pivots to work.

Bumped to 400.7.20190306.0 with 6f7c83b -> bd88157.

@cgwalters
Copy link
Member

/approve

@cgwalters
Copy link
Member

This LGTM but I am going to rebase #1402 on top and also add an environment variable to select the build so we can conveniently test new versions without rebuilding the installer.

@@ -2,6 +2,8 @@

set -ex

RHCOS_BUILD_NAME="${RHCOS_BUILD_NAME:-400.7.20190306.0}"
Copy link
Member

Choose a reason for hiding this comment

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

I don't have a problem with this but note that the version referenced isn't an official cut.

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't have a problem with this but note that the version referenced isn't an official cut.

I don't care what we pin to, just tell me what you want ;)

Copy link
Member

Choose a reason for hiding this comment

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

This is fine. I just wanted to note that it wasn't an officially ID'd build for any specific cut.

Copy link
Member

Choose a reason for hiding this comment

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

FWIW 400.7.20190312.0 now exists which includes a pivot update among other things. @cgwalters do you need that as part of the pin?

Copy link
Member

Choose a reason for hiding this comment

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

My tentative vote here is to ship this as is now and start building "mental muscle memory" or SOP for bumping it immediately after, but it's not a really strong opinion.

@abhinavdahiya
Copy link
Contributor

/test e2e-aws-rhel8

@cgwalters
Copy link
Member

:shipit: ?

@cgwalters
Copy link
Member

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, cgwalters, 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:
  • OWNERS [abhinavdahiya,wking]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ashcrow
Copy link
Member

ashcrow commented Mar 13, 2019

resource quota and replica set errors. Flakes?

@cgwalters
Copy link
Member

/retest

Yeah we have a successful run with the same commit.

@openshift-merge-robot openshift-merge-robot merged commit 37b99d8 into openshift:master Mar 13, 2019
@wking wking deleted the pin-rhcos branch March 13, 2019 22:32
wking added a commit to wking/openshift-installer that referenced this pull request Apr 3, 2019
Drop the HTTP stuff in favor of just the local asset or
OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE.  In order to make life convenient
for folks using OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE,
rhcos-bootimage.py takes a --platform argument (and, for AWS, a
--region argument) and spits out the value you'd feed into
OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE instead of updating the rhcos.json
asset source.

The codecs business works around the lack of byte-stream support in
json.load before Python 3.6 [1].

Also uncomment all of the regions in pkg/types/aws/validation
(unwinding that part of bd88157, hack/build: Pin to RHCOS
400.7.20190306.0, 2019-03-12, openshift#1407).  Instead, perform the "can we
find an AMI for that region?" check directly in
pkg/asset/installconfig/aws when we're building a list of regions for
the wizard prompt.  With this change, bumping the rhcos.json asset
(via the script) will automatically keep the wizard prompt's choices
in sync with the published AMIs.

[1]: https://docs.python.org/3/library/json.html#json.load
wking added a commit to wking/openshift-installer that referenced this pull request Apr 3, 2019
Uncomment all of the regions in pkg/types/aws/validation (unwinding
that part of bd88157, hack/build: Pin to RHCOS 400.7.20190306.0,
2019-03-12, openshift#1407).  Instead, perform the "can we find an AMI for that
region?" check directly in pkg/asset/installconfig/aws when we're
building a list of regions for the wizard prompt.  With this change,
bumping the rhcos.json asset (via hack/update-rhcos-bootimage.py) will
automatically keep the wizard prompt's choices in sync with the
published AMIs.
wking added a commit to wking/openshift-installer that referenced this pull request Apr 4, 2019
Uncomment all of the regions in pkg/types/aws/validation (unwinding
that part of bd88157, hack/build: Pin to RHCOS 400.7.20190306.0,
2019-03-12, openshift#1407).  Instead, perform the "can we find an AMI for that
region?" check directly in pkg/asset/installconfig/aws when we're
building a list of regions for the wizard prompt.  With this change,
bumping the rhcos.json asset (via hack/update-rhcos-bootimage.py) will
automatically keep the wizard prompt's choices in sync with the
published AMIs.
wking added a commit to wking/openshift-installer that referenced this pull request Oct 11, 2019
Uncomment all of the regions in pkg/types/aws/validation (unwinding
that part of bd88157, hack/build: Pin to RHCOS 400.7.20190306.0,
2019-03-12, openshift#1407).  Instead, perform the "can we find an AMI for that
region?" check directly in pkg/asset/installconfig/aws when we're
building a list of regions for the wizard prompt.  With this change,
bumping the rhcos.json asset (via hack/update-rhcos-bootimage.py) will
automatically keep the wizard prompt's choices in sync with the
published AMIs.
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants