Merge branch 'main' into add-details-in-output

go.mod

@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/sonobuoy
 
-go 1.19
+go 1.20
 
 require (
 	github.com/briandowns/spinner v1.19.0

pkg/client/logs.go

@@ -204,7 +204,11 @@ func watchPodsToStreamLogs(client kubernetes.Interface, cfg *LogConfig, podCh ch
 
 	go func() {
 		for {
-			v := <-ch
+			v, ok := <-ch
+			if !ok {
+				break
+			}
+
 			if v.Type == watch.Added && v.Object != nil {
 				switch t := v.Object.(type) {
 				case *v1.Pod:

scripts/build_funcs.sh

@@ -28,7 +28,7 @@ IMAGE_BRANCH=$(git rev-parse --abbrev-ref HEAD | sed 's/\///g')
 GIT_REF_LONG=$(git rev-parse --verify HEAD)
 
 BUILDMNT=/go/src/$GOTARGET
-BUILD_IMAGE=golang:1.19
+BUILD_IMAGE=golang:1.20
 AMD_IMAGE=gcr.io/distroless/static:nonroot
 ARM_IMAGE=gcr.io/distroless/static:nonroot-arm64
 PPC64LE_IMAGE=gcr.io/distroless/static:nonroot-ppc64le

test/integration/testImage/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.19 AS base
+FROM golang:1.20 AS base
 WORKDIR /src
 
 # Handle the go modules first to take advantage of Docker cache.

test/integration/testImage/src/go.mod

@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/sonobuoy/test/integration/testImage/src
 
-go 1.19
+go 1.20
 
 require (
 	github.com/pkg/errors v0.8.1