From 9c1b75923a61f13b9966677351acba39ad4812cf Mon Sep 17 00:00:00 2001 From: Matthias Bertschy Date: Mon, 15 Jan 2024 16:51:03 +0100 Subject: [PATCH] use fixed nginx image with sha256 Signed-off-by: Matthias Bertschy --- e2e/e2e_utils.go | 4 ++-- e2e/generate_filtered_sbom_test.go | 4 ++-- e2e/testdata/nginx-sbomspdx.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/e2e/e2e_utils.go b/e2e/e2e_utils.go index 5971b955..70b45f9b 100644 --- a/e2e/e2e_utils.go +++ b/e2e/e2e_utils.go @@ -47,7 +47,7 @@ func waitForPod(k8sClient *kubernetes.Clientset, podName, namespace, label strin return nil case false: fmt.Printf("pod: %s not ready yet\n", podName) - time.Sleep(2 * time.Second) + time.Sleep(5 * time.Second) } } } @@ -145,7 +145,7 @@ func waitForCustomResource(k8sClient *kubernetes.Clientset, path string, timeout return nil case false: fmt.Printf("resource: %s not ready yet\n", path) - time.Sleep(2 * time.Second) + time.Sleep(10 * time.Second) } } } diff --git a/e2e/generate_filtered_sbom_test.go b/e2e/generate_filtered_sbom_test.go index f079a192..c305a837 100644 --- a/e2e/generate_filtered_sbom_test.go +++ b/e2e/generate_filtered_sbom_test.go @@ -21,7 +21,7 @@ var ( //go:embed testdata/nginx-sbomspdx-filtered.json nginxSbomSpdxBytesFiltered []byte - expectedSbom string = "nginx-b49026" + expectedSbom string = "docker.io-library-nginx-sha256-2bdc49f2f8ae8d8dc50ed00f2ee56d00385c6f8bc8a8b320d0a294d9e3b49026-b49026" expectedSbomFiltered string = "pod-nginx-nginx-1ba5-4aaf" ) @@ -42,7 +42,7 @@ var _ = Describe("Generate filtered SBOM", func() { Containers: []v1.Container{ { Name: "nginx", - Image: "nginx", + Image: "docker.io/library/nginx@sha256:2bdc49f2f8ae8d8dc50ed00f2ee56d00385c6f8bc8a8b320d0a294d9e3b49026", }, }, }, diff --git a/e2e/testdata/nginx-sbomspdx.json b/e2e/testdata/nginx-sbomspdx.json index f5ce77f2..9a54cc86 100644 --- a/e2e/testdata/nginx-sbomspdx.json +++ b/e2e/testdata/nginx-sbomspdx.json @@ -11,7 +11,7 @@ "kubescape.io/image-id": "docker-io-library-nginx-sha256-2bdc49f2f8ae8d8dc50ed00f2ee56d00", "kubescape.io/image-name": "docker-io-library-nginx" }, - "name": "nginx-b49026", + "name": "docker.io-library-nginx-sha256-2bdc49f2f8ae8d8dc50ed00f2ee56d00385c6f8bc8a8b320d0a294d9e3b49026-b49026", "namespace": "kubescape", "uid": "9895a25e-407f-4793-a44e-3abfcb2e0fd8" },