-
Notifications
You must be signed in to change notification settings - Fork 462
*: create a single MCO image containing all MC* binaries #850
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
*: create a single MCO image containing all MC* binaries #850
Conversation
|
Ahhh: So i think i have to fix the test since those images don't build anymore Update: I think this is from the Makefile and/or i need openshift/installer#1847 |
|
/retest |
|
I don't really understand the e2e so well, but it seems to be running through expecting all of the dockerfiles that I deleted. So I changed my Dockerfile back to Dockerfile.machine-config-operator and it built: Perhaps I'll re-add the other ones and see if this gets me past this part of CI |
c3331ff to
8728d1e
Compare
|
Yep, we have jobs setup in openshift/release that must be changed as well, let's find a non breaking way to do that. |
sounds good! |
|
so the non-breaking way to land support in openshift/release would be to modify https://github.com/openshift/release/blob/master/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml#L13 to add the new Dockerfile while leaving the others here and there till we're able to make the switch |
|
Also, I suggest building a custom payload from this PR and installing it on a cluster to debug why the bootstrap is failing. |
55751d0 to
66be48a
Compare
have a few leads on this going to investigate and post an update! 😃 |
25b1cca to
2f651b9
Compare
|
so bootstrap is failing bc (from bootkube.log: I'm pretty sure this is bc I overzealously removed all of the other images from image-references (in favor of the machine-config-operator) when the installer still requires them and I underestimated how many ping-pong prs i'd need to get this done. |
|
Ok cool, I got past that error by reverting the image references. Pushing a fix for that MCO image in the manifests... |
|
So that fixed the images! Not sure about moving the setup-etcd-env into the MCO image, reverting that configmap change now bc I see: Which eventually causes a timeout. Will pick this up tomorrow. |
587e35e to
08cede1
Compare
|
I was testing out At that point it will also require changes to the |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, kikisdeliveryservice, runcom The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Right! I'm going to pull together the next phase of WIP PRs across repos, link them to the issue and we can decide what else we need before pulling the trigger on any of them since they will be breaking changes. 😄 |
|
trying this upgrade test (that should work and has worked) again: |
Remove references to mcc/mcd/mcs and setupetcd images now that the MCO has 1 super-image containing all of the sub-images Requires: openshift/machine-config-operator#850 Related-to: openshift/machine-config-operator#739
Template & bootstrap.go need to reference the MCO image instead of the old setupetcdenv image. Required-for: openshift/installer#1875 Related-to: openshift#850 Related-to: openshift#739 (issue will only close when final installer pr merges)
Template & bootstrap.go need to reference the MCO image instead of the old setupetcdenv image. Required-for: openshift/installer#1875 Related-to: openshift#850 Related-to: openshift#739 (issue will only close when final installer pr merges)
Operator.go & bootstrap.go need to reference the MCO image instead of the old setupetcdenv image. Update template to add setupetcdenv entrypoint for MCO image. Required-for: openshift/installer#1875 Related-to: openshift#850 Related-to: openshift#739 (issue will only close when final installer pr merges)
Since openshift/machine-config-operator#850 and openshift/installer#1875 the installer will take a single image for the machine config operator.
This is the 3rd pr in a series to fold all MC* images into one.
PR does the following as step 3:
images (mco/mcc/mcd/mcs/setup-etcd-env)
TO-DO in follow-on prs:
Related-to: #847 (merged)
Requires: openshift/installer#1847 (merged)
Related-to: #739 (issue will only close when final installer pr merges)