Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

cri: initial implementation of stage1 changes #3218

Merged
merged 1 commit into from
Sep 20, 2016

Conversation

s-urbaniak
Copy link
Contributor

@s-urbaniak s-urbaniak commented Sep 19, 2016

This PR pulls the stage1-based changes from the CRI branch back into
master, leaving out the changes in stage0 (new app subcommands).

Being in the beginning of the next release cycle this gives us the
opportunity to merge the first CRI efforts.

/cc @yifan-gu @lucab @squeed @alban

Relates to #2992

@s-urbaniak s-urbaniak added this to the v1.16.0 milestone Sep 19, 2016
@s-urbaniak
Copy link
Contributor Author

For a reference here is the stat-diff towards the cri branch:

$ git diff crisync..origin/cri
 Documentation/devel/stage1-implementors-guide.md |  34 +++++++++++++++++++++++++++++++
 rkt/app.go                                       |  28 ++++++++++++++++++++++++++
 rkt/app_add.go                                   | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rkt/app_exec.go                                  |  37 ++++++++++++++++++++++++++++++++++
 rkt/app_list.go                                  |  65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rkt/app_rm.go                                    |  82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rkt/app_sandbox.go                               | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rkt/app_start.go                                 |  98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rkt/app_status.go                                | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rkt/app_stop.go                                  |  94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rkt/list.go                                      |   1 -
 11 files changed, 876 insertions(+), 1 deletion(-)

@s-urbaniak
Copy link
Contributor Author

I set the do-not-merge label until I have a green light from CI.

@s-urbaniak
Copy link
Contributor Author

CI looks green enough for needs/review, PTAL :-)

[Unit]
Description=Halt
DefaultDependencies=no
AllowIsolate=yes
Copy link
Member

Choose a reason for hiding this comment

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

This unit is still referenced in many places, but it is removed here. How does it work?

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To add a little bit more context: the halt.target has a Requires/After dependency on shutdown.service in the case of mutable pods. This prevents mutable pods to shut down prematurely if there are no applications started.

Copy link
Member

@lucab lucab left a comment

Choose a reason for hiding this comment

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

LGTM

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants