Merge pull request skydive-project#2381 from lebauce/switch-to-kind

Fix k8s tests to pass on kind
datadope-io · Jul 23, 2021 · d1b35f8 · d1b35f8
2 parents 64561f1 + 7146bcb
commit d1b35f8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/scripts/ci/ovnkube-setup.sh b/scripts/ci/ovnkube-setup.sh
@@ -62,6 +62,7 @@ do_create () {
         sudo firewall-cmd --reload
     fi
 
+    rm -rf $GOPATH/src/github.com/ovn-org
     mkdir -p $GOPATH/src/github.com/ovn-org/
     pushd $GOPATH/src/github.com/ovn-org/
       git clone $OVNK8S_REPO
@@ -84,7 +85,6 @@ do_create () {
 
 do_delete() {
     do_stop
-    go clean --modcache
     rm -rf ${WORKSPACE}/go/src/github.com/ovn-org/ovn-kubernetes
     docker rmi ovn-kube-f || true
     docker network rm kind || true

diff --git a/tests/k8s/deployment.yaml b/tests/k8s/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: skydive-test-deployment

diff --git a/tests/k8s_test.go b/tests/k8s_test.go
@@ -197,7 +197,7 @@ func testNodeCreationFromConfig(t *testing.T, mngr, ty string, name interface{},
 
 /* -- test creation of single resource -- */
 func TestK8sClusterNode(t *testing.T) {
-	testNodeCreation(t, nil, nil, k8s.Manager, "cluster", getClusterName())
+	testNodeCreation(t, nil, nil, k8s.Manager, "cluster", nil)
 }
 
 func TestK8sConfigMapNode(t *testing.T) {