Merge branch 'dev' into rasswanth/fix-helm-upgrade

tox.ini

@@ -829,12 +829,16 @@ commands =
     bash -c "docker volume rm k3d-syft-images --force || true"
     bash -c "k3d registry delete k3d-registry.localhost || true"
 
+    # Creating registry
+    bash -c '\
+        export CLUSTER_NAME=syft CLUSTER_HTTP_PORT=${NODE_PORT} && \
+        tox -e dev.k8s.start'
+
     # Creating registry and cluster
-    bash -c 'k3d registry create registry.localhost --port 5800  -v `pwd`/k3d-registry:/var/lib/registry || true'
     bash -c 'NODE_NAME=syft NODE_PORT=${NODE_PORT} && \
         k3d cluster create syft -p "$NODE_PORT:80@loadbalancer" --registry-use k3d-registry.localhost || true \
         k3d cluster start syft'
-    CLUSTER_NAME=syft tox -e dev.k8s.patch.coredns
+
     sleep 10
     bash -c "kubectl --context k3d-syft create namespace syft || true"
 
@@ -1080,6 +1084,7 @@ description = E2E Notebook tests
 changedir = {toxinidir}
 deps =
     {[testenv:syft]deps}
+    nbmake
 allowlist_externals =
     bash
     pytest