Skip to content

Bug 1939605: cri-o+kuryr: Switch to proper netns management … #12316

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

Merged
openshift-merge-robot merged 1 commit into from
May 24, 2021
Merged

Bug 1939605: cri-o+kuryr: Switch to proper netns management … #12316

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
6 changes: 6 additions & 0 deletions roles/container_runtime/templates/crio.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ pids_limit = 1024
# Negative values indicate that no limit is imposed.
log_size_max = 52428800

{% if openshift_use_kuryr|default(false)|bool %}
# manage_network_ns_lifecycle determines whether we pin and remove network namespaces
# and manage their lifecycle
Comment on lines +119 to +120
Copy link
Member

@haircommander haircommander Apr 7, 2021

Choose a reason for hiding this comment

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

nit: can we put this clause inside of the if statement?

Copy link
Contributor Author

@dulek dulek Apr 7, 2021

Choose a reason for hiding this comment

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

Ah right, I should, that's a template.

manage_network_ns_lifecycle = true
{% endif %}

# The "crio.image" table contains settings pertaining to the
# management of OCI images.
[crio.image]
Expand Down
6 changes: 6 additions & 0 deletions roles/kuryr/templates/cni-daemonset.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ spec:
mountPath: /host_proc
- name: openvswitch
mountPath: /var/run/openvswitch
- name: netns
mountPath: /run/netns
mountPropagation: HostToContainer
{% if enable_kuryr_cni_probes|default(true)|bool %}
readinessProbe:
httpGet:
Expand Down Expand Up @@ -181,3 +184,6 @@ spec:
- name: host-var-run
hostPath:
path: /var/run
- name: netns
hostPath:
path: /run/netns