Skip to content

Commit

Permalink
use fixed nginx image with sha256
Browse files Browse the repository at this point in the history
Signed-off-by: Matthias Bertschy <matthias.bertschy@gmail.com>
  • Loading branch information
matthyx committed Jan 15, 2024
1 parent 46daa6c commit 98384f5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions e2e/e2e_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
Expand Down Expand Up @@ -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)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions e2e/generate_filtered_sbom_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -42,7 +42,7 @@ var _ = Describe("Generate filtered SBOM", func() {
Containers: []v1.Container{
{
Name: "nginx",
Image: "nginx",
Image: "docker.io/library/nginx@sha256:2bdc49f2f8ae8d8dc50ed00f2ee56d00385c6f8bc8a8b320d0a294d9e3b49026",
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/nginx-sbomspdx.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

0 comments on commit 98384f5

Please sign in to comment.