Skip to content

bootkube.sh: remove image refs for mco components #1875

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Jul 4, 2019
Merged

bootkube.sh: remove image refs for mco components #1875

openshift-merge-robot merged 1 commit into from
Jul 4, 2019

Conversation

@kikisdeliveryservice
Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice commented Jun 20, 2019 •
edited
Loading

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

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 20, 2019
@kikisdeliveryservice kikisdeliveryservice force-pushed the remove-mco-component-images branch from 04f985c to 8f7c1f5 Compare June 20, 2019 00:48
@kikisdeliveryservice kikisdeliveryservice changed the title [WIP] bootkube.sh: remove image refs for mcc/mcd/mcs [WIP] bootkube.sh: remove image refs for mco components Jun 20, 2019
@kikisdeliveryservice kikisdeliveryservice force-pushed the remove-mco-component-images branch 2 times, most recently from 423d75f to 4f7160e Compare June 20, 2019 00:52
@kikisdeliveryservice
Copy link
Contributor Author

kikisdeliveryservice commented Jun 21, 2019

/retest

@kikisdeliveryservice
bootkube.sh: remove image refs for mco components
c031996 
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
@kikisdeliveryservice kikisdeliveryservice force-pushed the remove-mco-component-images branch from 4f7160e to c031996 Compare June 21, 2019 21:16
@kikisdeliveryservice kikisdeliveryservice mentioned this pull request Jun 26, 2019
Merged
kikisdeliveryservice added a commit to kikisdeliveryservice/machine-config-operator that referenced this pull request Jun 26, 2019
@kikisdeliveryservice
cmd/mco: remove required flags for mco component images
94aa1a8 
As an intermediate PR, as part of folding mco images into one image,
remove the required flag for mcc/mcd/mcs/setupetcdenv images in bootstrap.go

Required-by: openshift/installer#1875
Required-by: openshift#895
Related-to: openshift#739
@kikisdeliveryservice kikisdeliveryservice mentioned this pull request Jun 26, 2019
Merged
@kikisdeliveryservice
Copy link
Contributor Author

kikisdeliveryservice commented Jun 26, 2019

/retest

@trown
Copy link

trown commented Jun 26, 2019

/test e2e-openstack

@kikisdeliveryservice kikisdeliveryservice mentioned this pull request Jun 26, 2019
Merged
kikisdeliveryservice added a commit to kikisdeliveryservice/machine-config-operator that referenced this pull request Jul 2, 2019
@kikisdeliveryservice
update template/boostrap.go to remove setup etcd env
61a9eba 
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)
kikisdeliveryservice added a commit to kikisdeliveryservice/machine-config-operator that referenced this pull request Jul 3, 2019
@kikisdeliveryservice
update template/bootstrap.go to remove setup etcd env
cdd6809 
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)
kikisdeliveryservice added a commit to kikisdeliveryservice/machine-config-operator that referenced this pull request Jul 3, 2019
@kikisdeliveryservice
update operator.go/bootstrap.go to remove setup etcd env
6189792 
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)
@runcom
Copy link
Member

runcom commented Jul 4, 2019

/retest

@runcom
Copy link
Member

runcom commented Jul 4, 2019

despite the WIP, this is ready now and passes e2e-aws :)

/approve
/retest

@runcom
Copy link
Member

runcom commented Jul 4, 2019

@abhinavdahiya can you review and merge this if it looks good to you? dependant PR are in place already

@runcom
Copy link
Member

runcom commented Jul 4, 2019 •
edited
Loading

/retest

I guess we can skip the scaleup test also (rest passes just fine)

@runcom
Copy link
Member

runcom commented Jul 4, 2019

/retest

@runcom
Copy link
Member

runcom commented Jul 4, 2019

not gonna pass 🤷‍♂ but PR is good to go anyway

/retest

@abhinavdahiya abhinavdahiya changed the title [WIP] bootkube.sh: remove image refs for mco components bootkube.sh: remove image refs for mco components Jul 4, 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 Jul 4, 2019
@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Jul 4, 2019

/lgtm

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

openshift-ci-robot commented Jul 4, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, kikisdeliveryservice, runcom

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 4, 2019
@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 4, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 720b488 into openshift:master Jul 4, 2019
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jul 5, 2019

@kikisdeliveryservice: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 c031996 link /test e2e-aws-scaleup-rhel7

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.

Details

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.

mandre added a commit to shiftstack/shiftstack-ci that referenced this pull request Jul 5, 2019
@mandre
Simplify building MCO image
a6be05f 
Since openshift/machine-config-operator#850 and
openshift/installer#1875 the installer will
take a single image for the machine config operator.
@mandre mandre mentioned this pull request Jul 5, 2019
Merged
@kikisdeliveryservice kikisdeliveryservice mentioned this pull request Jul 10, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@patrickdillon patrickdillon Awaiting requested review from patrickdillon

@vrutkovs vrutkovs Awaiting requested review from vrutkovs

Assignees

@abhinavdahiya abhinavdahiya

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@kikisdeliveryservice @trown @runcom @abhinavdahiya @openshift-ci-robot @openshift-bot @openshift-merge-robot