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

InfraContainer Rework #11102

Merged
merged 1 commit into from
Aug 27, 2021
Merged

Conversation

cdoern
Copy link
Contributor

@cdoern cdoern commented Aug 2, 2021

InfraContainer should go through the same creation process as regular containers. This change was from the cmd level
down, involving new container CLI opts and specgen creating functions. What now happens is that both container and pod
cli options are populated in cmd and used to create a podSpecgen and a containerSpecgen. The process then goes as follows

FillOutSpecGen (infra) -> PodCreate -> MakePod -> MapSpec (podSpec -> infraSpec) -> createPodOptions -> NewPod -> CompleteSpec (infra) -> MakeContainer -> ExecuteCreate -> NewContainer -> newContainer -> AddInfra (to pod state)

removed runtime_pod_infra_linux.go, infra now is on its way to following basic container creation path.

resolves #10933

Signed-off-by: cdoern [email protected]

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 2, 2021
@cdoern cdoern force-pushed the infraEnhance branch 14 times, most recently from 8ebed50 to 6c7785a Compare August 5, 2021 14:30
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 5, 2021
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 5, 2021
@cdoern cdoern force-pushed the infraEnhance branch 2 times, most recently from db266ff to e0c4b08 Compare August 6, 2021 18:32
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 6, 2021
@cdoern cdoern force-pushed the infraEnhance branch 2 times, most recently from 907e931 to e867f7a Compare August 6, 2021 18:41
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 6, 2021
@cdoern cdoern force-pushed the infraEnhance branch 6 times, most recently from cdd3184 to bb8010a Compare August 7, 2021 18:40
@cdoern cdoern force-pushed the infraEnhance branch 14 times, most recently from a68fa20 to ca80399 Compare August 26, 2021 04:29
@cdoern
Copy link
Contributor Author

cdoern commented Aug 26, 2021

@mheon PTAL, all tests passing and I think I avoided any breaking changes in the libpod API. sorry for all of the pings on this but thank you for your help!

@Luap99
Copy link
Member

Luap99 commented Aug 26, 2021

LGTM. My concern is addressed but @mheon should do a final review.

@cdoern cdoern force-pushed the infraEnhance branch 2 times, most recently from d30d3e9 to 1636a37 Compare August 26, 2021 19:21
InfraContainer should go through the same creation process as regular containers. This change was from the cmd level
down, involving new container CLI opts and specgen creating functions. What now happens is that both container and pod
cli options are populated in cmd and used to create a podSpecgen and a containerSpecgen. The process then goes as follows

FillOutSpecGen (infra) -> MapSpec (podOpts -> infraOpts) -> PodCreate -> MakePod -> createPodOptions -> NewPod -> CompleteSpec (infra) -> MakeContainer -> NewContainer -> newContainer -> AddInfra (to pod state)

Signed-off-by: cdoern <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Aug 27, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2021
@openshift-merge-robot openshift-merge-robot merged commit 266a389 into containers:main Aug 27, 2021
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Infra Container Enhancement
6 participants