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

fix(integrations/k8s-using-daemonset): --cri flag correct socket path #1140

Merged
merged 1 commit into from
Apr 16, 2020

Conversation

fntlnz
Copy link
Contributor

@fntlnz fntlnz commented Apr 10, 2020

The libsinsp cri interface prepends (at runtime) the HOST_ROOT prefix.

Thus, even if the CRI socket has been mounted on
/host/var/run/containerd/containerd.sock, the correct --cri flag
value is /var/run/containerd/containerd.sock.

Co-authored-by: Lorenzo Fontana lo@linux.com
Signed-off-by: Leonardo Di Donato leodidonato@gmail.com

What type of PR is this?

/kind documentation

Any specific area of the project related to this PR?

/area integrations

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

docs(integrations/k8s-using-daemonset): --cri flag correct socket path

The libsinsp cri interface prepends (at runtime) the `HOST_ROOT` prefix.

Thus, even if the CRI socket has been mounted on
`/host/var/run/containerd/containerd.sock`, the correct `--cri` flag
value is `/var/run/containerd/containerd.sock`.

Co-authored-by: Lorenzo Fontana <lo@linux.com>
Signed-off-by: Leonardo Di Donato <leodidonato@gmail.com>
@poiana
Copy link

poiana commented Apr 10, 2020

LGTM label has been added.

Git tree hash: a5e277a4b82f1d5b48825cee4b7e504a04bc2e8a

@fntlnz
Copy link
Contributor Author

fntlnz commented Apr 14, 2020

/milestone 0.22.0

@poiana poiana added this to the 0.22.0 milestone Apr 14, 2020
@fntlnz
Copy link
Contributor Author

fntlnz commented Apr 14, 2020

/hold
to let other Prs getting merged while this gets approvers

Copy link
Member

@leogr leogr left a comment

Choose a reason for hiding this comment

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

IMHO, we can now merge this, then 👉 #1145

@poiana
Copy link

poiana commented Apr 16, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: leodido, leogr

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@leodido
Copy link
Member

leodido commented Apr 16, 2020

/hold cancel

@poiana poiana merged commit 6c0e529 into master Apr 16, 2020
@poiana poiana deleted the fix/k8s-falco-cri-flag branch April 16, 2020 10:47
leogr added a commit to falcosecurity/charts that referenced this pull request May 21, 2020
See also:
- falcosecurity/falco#1140
- https://github.com/falcosecurity/falco/pull/1133/files

Co-authored-by: Leonardo Di Donato leodidonato@gmail.com
Signed-off-by: Leonardo Grasso <me@leonardograsso.com>
poiana pushed a commit to falcosecurity/charts that referenced this pull request May 22, 2020
See also:
- falcosecurity/falco#1140
- https://github.com/falcosecurity/falco/pull/1133/files

Co-authored-by: Leonardo Di Donato leodidonato@gmail.com
Signed-off-by: Leonardo Grasso <me@leonardograsso.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants