feat: use custom socket configurations from v1alpha3 #930
Conversation
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
… and v1alpha3 Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
… runtime socket to containers based on name Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
…tor and remover containers Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
…meSpec to set needed env vars to scan Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
…ot path Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
|
I haven't looked at the changes yet, but by looking at the files that were modified I can see that no tests were added :)
|
|
@pmengelbert the unit test file for the conversion was added in the other PR and the individual containers that we are changing already have unit tests to make sure they function, is there any other you think we need? I can maybe add one for setRuntimeSocketEnvVars in trivy? |
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
ashnamehrotra
force-pushed
the
use-custom-socket
branch
from
bbc60cd
to
0e65c00
Compare
pkg/scanners/trivy/trivy.go
Outdated
| if runtime == "" { | ||
| runtime = utils.RuntimeContainerd | ||
| userConfig.Runtime = unversioned.RuntimeSpec{ | ||
| Name: unversioned.Runtime(utils.EnvEraserRuntimeName), |
There was a problem hiding this comment.
This sets userConfig.Runtime.Name name to ERASER_RUNTIME_NAME ! It leads to the question of how this is working at all.
pkg/scanners/trivy/types_test.go
Outdated
| { | ||
| desc: "alternative runtime", | ||
| config: Config{Runtime: "crio"}, | ||
| expected: []string{"--format=json", "image", "--image-src", "crio", ref}, | ||
| config: Config{Runtime: unversioned.RuntimeSpec{Name: unversioned.RuntimeCrio, Address: unversioned.CrioPath}}, | ||
| expected: []string{"--format=json", "image", "--image-src", ImgSrcPodman, ref}, |
There was a problem hiding this comment.
For funsies let's add an alternative test case for dockershim
| ARG NODE_VERSION | ||
| FROM kindest/node:v${NODE_VERSION} |
There was a problem hiding this comment.
I'd name it KUBERNETES_VERSION since that's exactly what it is.
Makefile
Outdated
| custom-node: | ||
| docker build -t custom-node:latest \ | ||
| -f test/e2e/test-data/Dockerfile.customNode \ | ||
| --build-arg NODE_VERSION=${KUBERNETES_VERSION} test/e2e/test-data |
There was a problem hiding this comment.
As mentioned below, I would change the name of the build arg to KUBERNETES_VERSION. It makes it clearer where the value is ultimately coming from.
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
There was a problem hiding this comment.
LGTM, nice work!
@sozercan @salaxander can you give this a quick look just in case I missed something?
Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
What this PR does / why we need it:
Second PR to implement changes for configurable runtime socket.
Which issue(s) this PR fixes (optional, using
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when the PR gets merged):Fixes #647
Special notes for your reviewer: