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

Merge ironic and ironic-inspector repositories, single Dockerfile #253

Merged
merged 1 commit into from
May 3, 2021

Conversation

elfosardo
Copy link
Member

@elfosardo elfosardo commented Apr 12, 2021

This change moves Dockerfile, configuration and scripts from the
ironic-inspector container image repository to the ironic one.

This approach provides one Dockerfile that builds an image that contains
all the services necessary to run both ironic and ironic-inspector.
The scripts and configurations are kept separated for the time being as
some of them conflict with each other (e.g. runhttpd) and are being
renamed to avoid overwriting during the image building process.

Those changes will need to be reflected in CI as well.

This change is mutually exclusive with #252

@elfosardo elfosardo changed the title Merge ironic and ironic-inspector repositories, single Dockerfiles Merge ironic and ironic-inspector repositories, single Dockerfile Apr 12, 2021
@metal3-io-bot metal3-io-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 12, 2021
@elfosardo
Copy link
Member Author

/assign @maelk @dtantsur @hardys

@elfosardo
Copy link
Member Author

/test-integration

Copy link
Member

@dtantsur dtantsur left a comment

Choose a reason for hiding this comment

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

I like this path, just a couple of comments inline.

@elfosardo
Copy link
Member Author

/assign @fmuyassarov

@elfosardo
Copy link
Member Author

/test-integration

This change moves Dockerfile, configuration and scripts from the
ironic-inspector container image repository to the ironic one.

This approach provides one Dockerfile that builds an image that contains
all the services necessary to run both ironic and ironic-inspector.
The scripts and configurations are kept separated for the time being as
some of them conflict with each other (e.g. runhttpd) and are being
renamed to avoid overwriting during the image building process.

Those changes will need to be reflected in CI as well.
@elfosardo
Copy link
Member Author

/test-integration

@fmuyassarov
Copy link
Member

I assume we will have a single image (named Ironic..)? If yes, then we need to

  1. clean up ironic-inspector image references from Metal3-dev-env, some examples: ref1, ref2, etc.
  2. remove image building process from quay (this can be done after this PR goes in I think)

@elfosardo
Copy link
Member Author

I assume we will have a single image (named Ironic..)? If yes, then we need to

1. clean up ironic-inspector image references from Metal3-dev-env, some examples: [ref1](https://github.com/metal3-io/metal3-dev-env/blob/40e3f79b78d4f317e117b98731230a7c929f5307/vm-setup/roles/v1aX_integration_test/tasks/move.yml#L13), [ref2](https://github.com/metal3-io/metal3-dev-env/blob/9886555e8abb71fc58d676ba77553567e5aa8163/lib/common.sh#L159), etc.

2. remove image building process from [quay](https://quay.io/repository/metal3-io/ironic-inspector) (this can be done after this PR goes in I think)

Thanks @fmuyassarov !
that's correct, we'll have a single image that contains all needed for ironic and ironic-inspector
I was also looking at metal3-dev-env, but I think that also needs to be done after this PR merges?
I would also like to wait for metal3-io/baremetal-operator#851 and metal3-io/ironic-inspector-image#81 to merge first

@fmuyassarov
Copy link
Member

I assume we will have a single image (named Ironic..)? If yes, then we need to

1. clean up ironic-inspector image references from Metal3-dev-env, some examples: [ref1](https://github.com/metal3-io/metal3-dev-env/blob/40e3f79b78d4f317e117b98731230a7c929f5307/vm-setup/roles/v1aX_integration_test/tasks/move.yml#L13), [ref2](https://github.com/metal3-io/metal3-dev-env/blob/9886555e8abb71fc58d676ba77553567e5aa8163/lib/common.sh#L159), etc.

2. remove image building process from [quay](https://quay.io/repository/metal3-io/ironic-inspector) (this can be done after this PR goes in I think)

Thanks @fmuyassarov !
that's correct, we'll have a single image that contains all needed for ironic and ironic-inspector
I was also looking at metal3-dev-env, but I think that also needs to be done after this PR merges?
I would also like to wait for metal3-io/baremetal-operator#851 and metal3-io/ironic-inspector-image#81 to merge first

Yeah, I think metal3-dev-env changes can be done later too, because we will still have image for ironic-inspector in quay, so that won't really break the CI.

@fmuyassarov
Copy link
Member

I forgot about BMO, ref1, ref2, etc.

elfosardo added a commit to elfosardo/baremetal-operator that referenced this pull request Apr 19, 2021
After ironic-inspector merges with ironic image, we need to change the
reference of the ironic-inspector container to point to the ironic image
in quay.

This should happen after metal3-io/ironic-image#253
elfosardo added a commit to elfosardo/metal3-dev-env that referenced this pull request Apr 20, 2021
After ironic-inspector merges with ironic image, we need to change the
reference of the ironic-inspector container to point to the ironic image
in quay.

This should happen after metal3-io/ironic-image#253
Copy link
Member

@dtantsur dtantsur left a comment

Choose a reason for hiding this comment

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

\o/

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtantsur, elfosardo

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 20, 2021
elfosardo added a commit to elfosardo/baremetal-operator that referenced this pull request Apr 22, 2021
After ironic-inspector merges with ironic image, we need to change the
reference of the ironic-inspector container to point to the ironic image
in quay.

This should happen after metal3-io/ironic-image#253
elfosardo added a commit to elfosardo/baremetal-operator that referenced this pull request Apr 22, 2021
After ironic-inspector merges with ironic image, we need to change the
reference of the ironic-inspector container to point to the ironic image
in quay.

This should happen after metal3-io/ironic-image#253
@elfosardo
Copy link
Member Author

@maelk @fmuyassarov @hardys can you please have another look at this? Thanks!

Copy link
Member

@fmuyassarov fmuyassarov left a comment

Choose a reason for hiding this comment

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

Thanks, this LGTM. We will probably need to force merge this one too, considering tide isn't in place at this moment.

@elfosardo
Copy link
Member Author

@fmuyassarov thanks! As clarified on our chat, I'm totally ok waiting for tide to be back before we merge this.
We can re-evaluate the status during the week or early next week

@dtantsur
Copy link
Member

/lgtm

Tide is back?

@fmuyassarov
Copy link
Member

/lgtm

Tide is back?

It was for a while when I was testing. Still there are some minor things to setup :) but hopefully by Monday will be up.

@fmuyassarov
Copy link
Member

@elfosardo @dtantsur Prow is back on track. Probably /lgtm will be enough to get this PR in.

@dtantsur
Copy link
Member

dtantsur commented May 3, 2021

/lgtm

pretty please

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label May 3, 2021
@metal3-io-bot metal3-io-bot merged commit fd33e6e into metal3-io:master May 3, 2021
namnx228 pushed a commit to Nordix/baremetal-operator that referenced this pull request May 20, 2021
After ironic-inspector merges with ironic image, we need to change the
reference of the ironic-inspector container to point to the ironic image
in quay.

This should happen after metal3-io/ironic-image#253
namnx228 pushed a commit to Nordix/baremetal-operator that referenced this pull request May 26, 2021
After ironic-inspector merges with ironic image, we need to change the
reference of the ironic-inspector container to point to the ironic image
in quay.

This should happen after metal3-io/ironic-image#253
namnx228 pushed a commit to Nordix/baremetal-operator that referenced this pull request May 26, 2021
After ironic-inspector merges with ironic image, we need to change the
reference of the ironic-inspector container to point to the ironic image
in quay.

This should happen after metal3-io/ironic-image#253
namnx228 pushed a commit to Nordix/baremetal-operator that referenced this pull request May 28, 2021
After ironic-inspector merges with ironic image, we need to change the
reference of the ironic-inspector container to point to the ironic image
in quay.

This should happen after metal3-io/ironic-image#253
elfosardo added a commit to elfosardo/baremetal-operator that referenced this pull request Jun 11, 2021
After ironic-inspector merges with ironic image, we need to change the
reference of the ironic-inspector container to point to the ironic image
in quay.

This should happen after metal3-io/ironic-image#253

(cherry picked from commit 99fc4ae)
levsha pushed a commit to levsha/baremetal-operator that referenced this pull request Sep 1, 2021
After ironic-inspector merges with ironic image, we need to change the
reference of the ironic-inspector container to point to the ironic image
in quay.

This should happen after metal3-io/ironic-image#253
levsha pushed a commit to levsha/baremetal-operator that referenced this pull request Sep 1, 2021
After ironic-inspector merges with ironic image, we need to change the
reference of the ironic-inspector container to point to the ironic image
in quay.

This should happen after metal3-io/ironic-image#253
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants