-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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 47.297 and quay.io/openshift-release-dev/ocp-release:4.0.0-0.3 #1192
Conversation
9330f0a
to
3c581f5
Compare
Likely cause from bootkube.service:
That flag is from openshift/machine-config-operator@77ed063cc5 (openshift/machine-config-operator#355). I'm still trying to figure out why there's a mismatch between setting it and respecting it. |
$ oc adm release info --commits quay.io/openshift-release-dev/ocp-release:4.0.0-0.3 | grep ' machine-config-operator'
machine-config-operator https://github.com/openshift/machine-config-operator 96228eb286a36944b8a729abeea0442ed73af776
$ git log --first-parent --decorate --oneline -3 77ed063
77ed063 (origin/pr/355) operator: Add bootstrap arg --machine-config-oscontent-image
71ace53 Merge pull request #343 from abhinavdahiya/controller_images
96228eb Merge pull request #352 from rphillips/fix/file_validation_for_overwritten_file So that explains why the flag is not supported. So who's setting it? $ oc adm release extract --from=quay.io/openshift-release-dev/ocp-release:4.0.0-0.3 --to=/tmp/manifests
Extracted release payload from digest sha256:5b7d1c80f75a7703b5622de7273d63b4939dbfae1986b87b3fee436a1dacab44 created at 2019-02-04T15:49:32Z
$ grep -r oscontent /tmp/manifests # no hits Hmm. $ git log --decorate --oneline -U0 -G machine-config-oscontent-image origin/master
e2b31b2 (origin/pr/1149) bootkube: Supply machine-os-content to MCO
diff --git a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
index a2fe578..7bc5270 100755
--- a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
+++ b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
@@ -22,0 +23 @@ MACHINE_CONFIG_DAEMON_IMAGE=$(podman run --rm ${release} image machine-config-da
+MACHINE_CONFIG_OSCONTENT=$(podman run --rm ${release} image machine-os-content)
@@ -131,0 +133 @@ then
+ --machine-config-oscontent-image=${MACHINE_CONFIG_OSCONTENT} Wait, that commit isn't part of this branch: $ git log --graph --oneline --decorate -5 origin/master origin/pr/1192 | cat
* 3c581f5 (HEAD, wking/version-0.12.0-pins, origin/pr/1192, version-0.12.0-pins) hack/build: Pin to RHCOS 47.297 and quay.io/openshift-release-dev/ocp-release:4.0.0-0.3
* 2e5acd0 (wking/version-0.12.0, origin/pr/1191, version-0.12.0) CHANGELOG: Document changes since 0.11.0
| * d1e59b3 (origin/master, origin/HEAD) Merge pull request #1149 from cgwalters/bootkube-osimageurl
| |\
|/ /
| * e2b31b2 (origin/pr/1149) bootkube: Supply machine-os-content to MCO
* | da6d45b Merge pull request #890 from staebler/asset_loading_tests
|\ \ So how is logic from #1149 ending up in my unit tests here? |
Ah, the commit under test is this branch merged into the current master. So to test this PR in its own right we'd need to point it at a new |
@wking: The following tests failed, say
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. |
3c581f5
to
cc9e8c5
Compare
Through da6d45b (Merge pull request openshift#890 from staebler/asset_loading_tests, 2019-02-04). Background for the networking.type validation entry is in this thread [1]. The OpenStack HAProxy entry has wording based on [2] and Russell's out-of-band suggestions. Forwarding static-pod longs to systemd is still in flight with [3]. [1]: openshift#1013 (comment) [2]: https://github.com/openshift/installer/pull/1185/files#r253714521 [3]: openshift/cluster-bootstrap#11
…-release:4.0.0-0.3 The bump from RHCOS 47.280 to 47.297 brings in, among other things, v0.12 kubelets. Clayton pushed 4.0.0-0.nightly-2019-01-30-145955 to quay.io/openshift-release-dev/ocp-release:4.0.0-0.3. Renaming OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE gets us CI testing of the pinned release despite openshift/release@60007df2 (Use RELEASE_IMAGE_LATEST for CVO payload, 2018-10-03, openshift/release#1793). Also comment out regions which this particular RHCOS build wasn't pushed to, leaving only: $ curl -s https://releases-rhcos.svc.ci.openshift.org/storage/releases/maipo/47.297/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 I'd initially expected to export the pinning environment variables in release.sh, but I've put them in build.sh here because our continuous integration tests use build.sh directly and don't go through release.sh. [1]: containers/podman#2106
cc9e8c5
to
b9dbde6
Compare
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: 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 |
the release image is 7 days old :( it would be nice if we pin to somewhat latest ... ?
|
This is 0.12.0 now, so... /close
There was some sort or ART hiccup, so this was the somewhat-latest when it was selected for QE on Friday. It just took us a bit to turn this around ;). |
@wking: Closed this PR. In response to this:
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. |
DO NOT MERGE! This PR is just for CI coverage (like #1134 and similar before it).
The bump from RHCOS 47.280 to 47.297 brings in, among other things, v0.12 kubelets.
@smarterclayton pushed
4.0.0-0.nightly-2019-01-30-145955
to quay.io/openshift-release-dev/ocp-release:4.0.0-0.3./hold