* : remove refs to component images & dockerfiles #895

kikisdeliveryservice · 2019-06-26T01:04:28Z

Remove all references to mcc/mcd/mcs/setupetdenv images so that we rely on the new MCO mega image only.

Note: Dockerfile.rhel7 images will be removed in a followup PR pending ART merge

Requires: openshift/installer#1875
Related-to: #739

kikisdeliveryservice · 2019-06-26T02:55:30Z

expected failure until i remove the component images from the installer (this is the first flag here bootkube.sh) via this PR openshift/installer#1875:
bootkube.sh[23882]: F0626 02:35:58.973555 1 main.go:29] Error executing mcc: unknown flag: --setup-etcd-env-image

cmd/machine-config-operator/bootstrap.go

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

pkg/operator/operator.go

runcom · 2019-06-27T12:51:52Z

pkg/operator/bootstrap.go

Basically, we can't just remove this for templates under templates/ otherwise how https://github.com/openshift/machine-config-operator/pull/895/files#diff-db87ea55a6cbf22e6bd99d79dc77e943R16 knows about the MCO image itself (see https://github.com/openshift/machine-config-operator/pull/895/files#r298159078)

ok gotcha. this one was trickier than the others and i wasn't 100% sure on it. thanks!

i think bc the other times i passed the MCO image with the command override I wasn't totally sure here about whether this is a delete or a replace with MCO image. Willl update!!

kikisdeliveryservice · 2019-07-03T21:31:05Z

Cleaning this up to pull in the changes from #899 for testing

install/0000_80_machine-config-operator_02_images.configmap.yaml

runcom · 2019-07-04T14:41:47Z

Can we also remove all the Dockerfile.* for the components not needed anymore and just live with a single, pure Dockerfile and Dockerfile.rhel7 (requires tweakings to hack/{build-image.sh,push-image.sh and Makefile)

kikisdeliveryservice · 2019-07-08T23:45:39Z

Can we also remove all the Dockerfile.* for the components not needed anymore and just live with a single, pure Dockerfile and Dockerfile.rhel7 (requires tweakings to hack/{build-image.sh,push-image.sh and Makefile)

Yep. In Progress.

kikisdeliveryservice · 2019-07-09T00:08:18Z

Need to rename Dockerfile refs in release so that these updates using the simplified name Dockerfile work. (See PR: openshift/release#4314)

Have tested both scripts locally. Still need to update Makefile.

kikisdeliveryservice · 2019-07-09T00:25:04Z

In order to rename our new master dockerfile which is currently called Dockerfile.machine-config-operator to just Dockerfile but not break CI, I think I need to:

in a seperate PR add a dockerfile named Dockerfile to the MCO repo (this is just a copy of the current Dockerfile.machine-config-operator - our dockerfile that makes all of our images)
merge PR ci-operator/mco: rename mco dockerfile release#4314
update ART (pr open waiting for approval)
delete the old Dockerfile.machine-config-operator (the old master dockerfile containing all the component images) in another PR or just via this PR

kikisdeliveryservice · 2019-07-10T22:17:00Z

/retest

kikisdeliveryservice · 2019-07-10T23:48:30Z

Since this can't be merged until ART hack/makefile changes are separate PRs. Will rebase this onto #950 and #948 which has those changes.

That said, @runcom couldn't I make the non-Rhel 7 changes from this PR and then land the Rhel7 changes in another PR after we get that sorted? The release PR already merged.

runcom · 2019-07-11T08:46:07Z

That said, @runcom couldn't I make the non-Rhel 7 changes from this PR and then land the Rhel7 changes in another PR after we get that sorted? The release PR already merged.

sure thing, hopefully that ART PR gets merged today also

Remove all references to mcc/mcd/mcs/setupetdenv images in images.go, bootstrap.go and configmap.yaml Related-to: openshift#739

Note: Dockerfile...rhel7 component images will be removed in a followup PR pending ART merge Related-to: openshift#739

Since all component images have been folded into 1 master mco image, remove rhel7 dockerfiles pending merge of ocp-build-data/merge_requests/181 Related-to: openshift#739 Followup-to: openshift#895

kikisdeliveryservice · 2019-07-12T00:46:49Z

@runcom split out rhel7 dockerfile deletions into #959 since ART is having some issues merging the PR. They are working on it. Took off the WIP on this on so it's ready (pending this passing e2e)

runcom · 2019-07-12T10:13:21Z

/retest
/lgtm

openshift-ci-robot · 2019-07-12T10:13:32Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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:

~~OWNERS~~ [kikisdeliveryservice,runcom]

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

kikisdeliveryservice requested a review from runcom June 26, 2019 01:04

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 Jun 26, 2019

kikisdeliveryservice changed the title ~~[WIP] *: remove refs to component images~~ [WIP] : remove refs to component images Jun 26, 2019

kikisdeliveryservice changed the title ~~[WIP] : remove refs to component images~~ [WIP] * : remove refs to component images Jun 26, 2019

openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 26, 2019

openshift-ci-robot requested review from cgwalters and ericavonb June 26, 2019 01:24

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 26, 2019

kikisdeliveryservice force-pushed the remove-component-images branch from 212097a to a6fd8cc Compare June 26, 2019 01:29

runcom reviewed Jun 26, 2019

View reviewed changes

cmd/machine-config-operator/bootstrap.go Outdated Show resolved Hide resolved

This was referenced Jun 26, 2019

cmd/mco: remove required flags for mco component images #897

Merged

templates/mco: update template to replace setupetcdenv image with MCO image #899

Merged

runcom reviewed Jun 27, 2019

View reviewed changes

pkg/operator/operator.go Outdated Show resolved Hide resolved

runcom reviewed Jun 27, 2019

View reviewed changes

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 27, 2019

kikisdeliveryservice force-pushed the remove-component-images branch from a6fd8cc to b926d1d Compare July 3, 2019 20:27

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 3, 2019

kikisdeliveryservice force-pushed the remove-component-images branch from b926d1d to 29dbaeb Compare July 3, 2019 21:48

kikisdeliveryservice commented Jul 3, 2019

View reviewed changes

install/0000_80_machine-config-operator_02_images.configmap.yaml Outdated Show resolved Hide resolved

kikisdeliveryservice force-pushed the remove-component-images branch from 29dbaeb to 6f7502e Compare July 3, 2019 23:11

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 6, 2019

kikisdeliveryservice force-pushed the remove-component-images branch from 6f7502e to 12717ca Compare July 8, 2019 23:52

openshift-ci-robot removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 8, 2019

openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 8, 2019

kikisdeliveryservice mentioned this pull request Jul 9, 2019

ci-operator/mco: rename mco dockerfile openshift/release#4314

Merged

kikisdeliveryservice mentioned this pull request Jul 10, 2019

Fold MCO images into one #739

Closed

kikisdeliveryservice mentioned this pull request Jul 10, 2019

dev: update push-image.sh to use new single mco image #950

Merged

kikisdeliveryservice force-pushed the remove-component-images branch from 12717ca to a9d75e7 Compare July 10, 2019 23:38

remove refs to component images

52a89ff

Remove all references to mcc/mcd/mcs/setupetdenv images in images.go, bootstrap.go and configmap.yaml Related-to: openshift#739

kikisdeliveryservice force-pushed the remove-component-images branch from a9d75e7 to 67fa1a4 Compare July 11, 2019 23:38

openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 11, 2019

remove component mcc/mcd/mcs/setupetcd dockerfiles

4998ca4

Note: Dockerfile...rhel7 component images will be removed in a followup PR pending ART merge Related-to: openshift#739

kikisdeliveryservice force-pushed the remove-component-images branch from 67fa1a4 to 4998ca4 Compare July 11, 2019 23:43

kikisdeliveryservice mentioned this pull request Jul 11, 2019

remove component mcc/mcd/mco/mcs/setupetcdenv rhel7 dockerfiles #959

Merged

kikisdeliveryservice changed the title ~~[WIP] * : remove refs to component images~~ * : remove refs to component images & dockerfiles Jul 12, 2019

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 12, 2019

openshift-ci-robot assigned runcom Jul 12, 2019

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 12, 2019

openshift-merge-robot merged commit 43b202c into openshift:master Jul 12, 2019

* : remove refs to component images & dockerfiles #895

* : remove refs to component images & dockerfiles #895

Uh oh!

Conversation

kikisdeliveryservice commented Jun 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kikisdeliveryservice commented Jun 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

runcom Jun 27, 2019

Choose a reason for hiding this comment

Uh oh!

kikisdeliveryservice Jun 27, 2019

Choose a reason for hiding this comment

Uh oh!

kikisdeliveryservice Jun 27, 2019

Choose a reason for hiding this comment

Uh oh!

kikisdeliveryservice commented Jul 3, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

runcom commented Jul 4, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kikisdeliveryservice commented Jul 8, 2019

Uh oh!

kikisdeliveryservice commented Jul 9, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kikisdeliveryservice commented Jul 9, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kikisdeliveryservice commented Jul 10, 2019

Uh oh!

kikisdeliveryservice commented Jul 10, 2019

Uh oh!

runcom commented Jul 11, 2019

Uh oh!

kikisdeliveryservice commented Jul 12, 2019

Uh oh!

runcom commented Jul 12, 2019

Uh oh!

openshift-ci-robot commented Jul 12, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kikisdeliveryservice commented Jun 26, 2019 •

edited

Loading

kikisdeliveryservice commented Jun 26, 2019 •

edited

Loading

kikisdeliveryservice commented Jul 3, 2019 •

edited

Loading

runcom commented Jul 4, 2019 •

edited

Loading

kikisdeliveryservice commented Jul 9, 2019 •

edited

Loading

kikisdeliveryservice commented Jul 9, 2019 •

edited

Loading