Skip to content

[release-4.4] crio: Add explicit paths for configuration settings #1700

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.

Sign up for GitHub

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

Closed
mrunalp wants to merge 1 commit into from
Closed

[release-4.4] crio: Add explicit paths for configuration settings #1700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/master/01-master-container-runtime/_base/files/crio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ contents:
# Path to the seccomp.json profile which is used as the default seccomp profile
# for the runtime. If not specified, then the internal default seccomp profile
# will be used.
seccomp_profile = ""
seccomp_profile = "/etc/crio/seccomp.json"
Copy link
Member

@wking wking Apr 30, 2020

Choose a reason for hiding this comment

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

Oh, wait. This isn't a revert of 606bd2b (#1414). Before #1414, this line was # seccomp_profile... (commented out). In #1414 it became master's current empty string. With this commit it is becoming an uncommented, nonempty value. So was there a default baked into CRI-O at some point, but no longer? And now we need to provide the old default explicitly here to support CRI-O that are recent enough to have dropped the baked-in-default? But bug 1829642 is about supporting older CRI-O? I'm confused about how these pieces fit together.

Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice Apr 30, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

it was commented out further back: 69025e8#diff-5c79cb2bed55d5971e8178e82d18cdc9

via #1216

Copy link
Member

@wking wking Apr 30, 2020

Choose a reason for hiding this comment

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

Ah, ok. And looks like #1216 went out in 4.3 and was never backported to 4.2.

Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice Apr 30, 2020

Choose a reason for hiding this comment

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

pretty sure that 4.2/1/.12 fails if these are empty so it cant be backported

Copy link
Contributor

@umohnani8 umohnani8 Apr 30, 2020

Choose a reason for hiding this comment

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

Yeah this is needed, so that cri-o 1.14 can use this config and not fail to start up like it was.


# Used to change the name of the default AppArmor profile of CRI-O. The default
# profile name is "crio-default-" followed by the version string of CRI-O.
Expand Down Expand Up @@ -196,7 +196,7 @@ contents:
# - runtime_root (optional, string): root directory for storage of containers
# state.
[crio.runtime.runtimes.runc]
runtime_path = ""
runtime_path = "/usr/bin/runc"
runtime_type = "oci"
runtime_root = "/run/runc"

Expand Down
4 changes: 2 additions & 2 deletions templates/worker/01-worker-container-runtime/_base/files/crio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ contents:
# Path to the seccomp.json profile which is used as the default seccomp profile
# for the runtime. If not specified, then the internal default seccomp profile
# will be used.
seccomp_profile = ""
seccomp_profile = "/etc/crio/seccomp.json"

# Used to change the name of the default AppArmor profile of CRI-O. The default
# profile name is "crio-default-" followed by the version string of CRI-O.
Expand Down Expand Up @@ -196,7 +196,7 @@ contents:
# - runtime_root (optional, string): root directory for storage of containers
# state.
[crio.runtime.runtimes.runc]
runtime_path = ""
runtime_path = "/usr/bin/runc"
runtime_type = "oci"
runtime_root = "/run/runc"

Expand Down