Update Dockerfile to use Entrypoint Script to support Cgroupv2 #3237
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes usage of containerized k3s on cgroupv2 systems Signed-off-by: Thorsten Klein <iwilltry42@gmail.com>
AkihiroSuda
suggested changes
Apr 27, 2021
| @@ -19,5 +20,5 @@ VOLUME /var/lib/cni | |||
| VOLUME /var/log | |||
| ENV PATH="$PATH:/bin/aux" | |||
| ENV CRI_CONFIG_FILE="/var/lib/rancher/k3s/agent/etc/crictl.yaml" | |||
| ENTRYPOINT ["/bin/k3s"] | |||
| ENTRYPOINT ["/bin/entrypoint.sh"] | |||
There was a problem hiding this comment.
The logic should be coded in k3s agent, not in a shell script IMHO
There was a problem hiding this comment.
The logic should be coded in k3s agent, not in a shell script IMHO
Agree
There was a problem hiding this comment.
sounds like we're in agreement that this should go into the k3s agent code alongside the other cgroup handling stuff.
iwilltry42
commented
Apr 27, 2021
There was a problem hiding this comment.
Suggested changes as per https://github.com/k3s-io/k3s/pull/3237/files#r621450213 (-> moby/moby#42331)
|
Closing this because there's a better place for this in k3s agent code. |
iwilltry42
added a commit
to iwilltry42/k3s
that referenced
this pull request
Apr 28, 2021
- Ref: see discussion at k3s-io#3237
iwilltry42
added a commit
to iwilltry42/k3s
that referenced
this pull request
Apr 28, 2021
- Ref: see discussion at k3s-io#3237
iwilltry42
added a commit
to k3d-io/k3d
that referenced
this pull request
Apr 28, 2021
- Cgroupv2 fix as per k3s-io/k3s#3237 & k3s-io/k3s#3242
iwilltry42
added a commit
to iwilltry42/k3s
that referenced
this pull request
Apr 28, 2021
- Ref: see discussion at k3s-io#3237 Signed-off-by: Thorsten Klein <iwilltry42@gmail.com>
iwilltry42
added a commit
to iwilltry42/k3s
that referenced
this pull request
May 12, 2021
- Ref: see discussion at k3s-io#3237 Signed-off-by: Thorsten Klein <iwilltry42@gmail.com>
iwilltry42
added a commit
to iwilltry42/k3s
that referenced
this pull request
Jul 20, 2021
- Ref: see discussion at k3s-io#3237 Signed-off-by: Thorsten Klein <iwilltry42@gmail.com>
This was referenced Sep 27, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Fixes usage of containerized k3s on cgroupv2 systems
Types of Changes
Verification
server)Linked Issues
Further Comments