Track down test flakes

.github/workflows/master.yaml

@@ -47,7 +47,7 @@ jobs:
       - name: Install Ginkgo testing framework
         run: |
           # Do the install from outside the code tree to avoid messing with go.sum
-          cd /tmp; go install github.com/onsi/ginkgo/ginkgo@v1.16.4
+          cd /tmp; go install github.com/onsi/ginkgo/v2/ginkgo@v2.3.1
       - name: Configure AWS credentials to use in AWS Stack tests
         uses: aws-actions/configure-aws-credentials@v1
         with:

.github/workflows/release.yaml

@@ -26,7 +26,7 @@ jobs:
       - name: Install Ginkgo testing framework
         run: |
           # Do the install from outside the code tree to avoid messing with go.sum
-          cd /tmp; go install github.com/onsi/ginkgo/ginkgo@v1.16.4
+          cd /tmp; go install github.com/onsi/ginkgo/v2/ginkgo@v2.3.1
       - name: Configure AWS credentials to use in AWS Stack tests
         uses: aws-actions/configure-aws-credentials@v1
         with:

.github/workflows/run-acceptance-tests.yaml

@@ -59,7 +59,7 @@ jobs:
       - name: Install Ginkgo testing framework
         run: |
           # Do the install from outside the code tree to avoid messing with go.sum
-          cd /tmp; go install github.com/onsi/ginkgo/ginkgo@v1.16.4
+          cd /tmp; go install github.com/onsi/ginkgo/v2/ginkgo@v2.3.1
       - name: Configure AWS credentials to use in AWS Stack tests
         uses: aws-actions/configure-aws-credentials@v1
         with:

CHANGELOG.md

@@ -14,6 +14,8 @@ CHANGELOG
   [#324](https://github.com/pulumi/pulumi-kubernetes-operator/pull/324)
 - Add functionality for using [Pulumi YAML](https://www.pulumi.com/docs/intro/languages/yaml/) in-line to create Pulumi programs.
   [#336](https://github.com/pulumi/pulumi-kubernetes-operator/pull/336)
+- [internal] Port testing to Ginkgo v2 and address test flakes
+  [#337](https://github.com/pulumi/pulumi-kubernetes-operator/pull/337)
 
 ## 1.9.0 (2022-10-05)
 

Makefile

@@ -5,6 +5,7 @@ PUBLISH_IMAGE_NAME := pulumi/pulumi-kubernetes-operator
 IMAGE_NAME := docker.io/$(shell whoami)/pulumi-kubernetes-operator
 CURRENT_RELEASE := $(shell git describe --abbrev=0 --tags)
 RELEASE ?= $(shell git describe --abbrev=0 --tags)
+TEST_NODES ?= 4
 
 default: build
 
@@ -47,7 +48,7 @@ push-image:
 
 test: codegen download-test-deps
 	KUBEBUILDER_ASSETS="$(shell setup-envtest --use-env use -p path)" \
-		ginkgo -nodes=4 --randomizeAllSpecs ./test/...
+		ginkgo -nodes=${TEST_NODES} --randomize-all ./test/...
 
 deploy:
 	kubectl apply -f deploy/yaml/service_account.yaml

go.mod

@@ -8,11 +8,11 @@ require (
 	github.com/go-logr/logr v0.4.0
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.13.0
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/onsi/gomega v1.22.0
 	github.com/operator-framework/operator-lib v0.7.0
 	github.com/operator-framework/operator-sdk v0.19.4
-	github.com/pkg/errors v0.9.1
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/common v0.30.0 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
@@ -21,13 +21,13 @@ require (
 	github.com/stretchr/testify v1.7.0
 	github.com/whilp/git-urls v1.0.0
 	golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503 // indirect
-	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
+	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
 	golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/src-d/go-git.v4 v4.13.1
 	k8s.io/api v0.21.1
 	k8s.io/apiextensions-apiserver v0.21.1
@@ -39,6 +39,12 @@ require (
 	sigs.k8s.io/controller-runtime v0.9.0
 )
 
+require (
+	github.com/go-git/go-git/v5 v5.4.2
+	github.com/onsi/ginkgo/v2 v2.3.1
+	sigs.k8s.io/yaml v1.2.0
+)
+
 require (
 	cloud.google.com/go v0.65.0 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -62,14 +68,13 @@ require (
 	github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
 	github.com/go-git/gcfg v1.5.0 // indirect
 	github.com/go-git/go-billy/v5 v5.3.1 // indirect
-	github.com/go-git/go-git/v5 v5.4.2 // indirect
 	github.com/go-logr/zapr v0.4.0 // indirect
 	github.com/gofrs/uuid v3.3.0+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
@@ -115,13 +120,12 @@ require (
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/component-base v0.21.1 // indirect
 	k8s.io/klog v1.0.0 // indirect
 	k8s.io/kube-state-metrics v1.7.2 // indirect
 	lukechampine.com/frand v1.4.2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
-	sigs.k8s.io/yaml v1.2.0 // indirect
 	sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 // indirect
 )