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

.github/workflows/ci-lint.yaml

@@ -6,9 +6,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: golangci-lint run
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.52.2
+          version: v1.61.0
           skip-pkg-cache: true
           skip-build-cache: true
           args: --timeout=5m0s -v
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.23
       - name: go mod tidy
         run: |
           ./scripts/ci/check_go_modules.sh

.github/workflows/ci-test.yaml

@@ -182,7 +182,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.23
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
         with:

go.mod

@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/sonobuoy
 
-go 1.20
+go 1.23
 
 require (
 	github.com/briandowns/spinner v1.19.0
@@ -14,10 +14,10 @@ require (
 	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.14.0
-	golang.org/x/sync v0.1.0
-	golang.org/x/term v0.13.0
-	golang.org/x/text v0.13.0
+	github.com/spf13/viper v1.18.0
+	golang.org/x/sync v0.5.0
+	golang.org/x/term v0.18.0
+	golang.org/x/text v0.14.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.27.1
@@ -29,11 +29,11 @@ require (
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fatih/color v1.14.1 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.1 // indirect
@@ -43,7 +43,7 @@ require (
 	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.4.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -52,25 +52,29 @@ require (
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/spf13/afero v1.9.3 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/subosito/gotenv v1.4.1 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/oauth2 v0.3.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/oauth2 v0.15.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	k8s.io/klog/v2 v2.90.1 // indirect

pkg/buildinfo/version.go

@@ -21,7 +21,7 @@ package buildinfo
 
 // Version is the current version of Sonobuoy, set by the go linker's -X flag at build time.
 // Ensure that this is bumped manually as well so that Sonobuoy, as a library, also has the right version.
-var Version = "v0.56.17"
+var Version = "v0.57.2"
 
 // GitSHA is the actual commit that is being built, set by the go linker's -X flag at build time.
 var GitSHA string

pkg/client/gen.go

@@ -410,6 +410,38 @@ func generateAggregatorAndService(w io.Writer, cfg *GenConfig) error {
 	if len(cfg.Config.CustomAnnotations) > 0 {
 		p.ObjectMeta.Annotations = cfg.Config.CustomAnnotations
 	}
+	if len(cfg.Config.AggregatorTolerations) > 0 {
+		for _, t := range cfg.Config.AggregatorTolerations {
+			var toleration corev1.Toleration
+			if val, exists := t["key"]; exists {
+				toleration.Key = val
+			}
+			if val, exists := t["value"]; exists {
+				toleration.Value = val
+			}
+			if val, exists := t["effect"]; exists {
+				if val == "NoSchedule" {
+					toleration.Effect = corev1.TaintEffectNoSchedule
+				} else if val == "NoExecute" {
+					toleration.Effect = corev1.TaintEffectNoExecute
+				} else if val == "PreferNoSchedule" {
+					toleration.Effect = corev1.TaintEffectPreferNoSchedule
+				} else {
+					return errors.New("Invalid effect: " + val)
+				}
+			}
+			if val, exists := t["operator"]; exists {
+				if val == "Equal" {
+					toleration.Operator = corev1.TolerationOpEqual
+				} else if val == "Exists" {
+					toleration.Operator = corev1.TolerationOpExists
+				} else {
+					return errors.New("Invalid operator: " + val)
+				}
+			}
+			p.Spec.Tolerations = append(p.Spec.Tolerations, toleration)
+		}
+	}
 
 	switch cfg.Config.SecurityContextMode {
 	case "none":

pkg/config/config.go

@@ -147,16 +147,17 @@ type Config struct {
 	///////////////////////////////////////////////
 	// Sonobuoy configuration
 	///////////////////////////////////////////////
-	WorkerImage              string            `json:"WorkerImage" mapstructure:"WorkerImage"`
-	ImagePullPolicy          string            `json:"ImagePullPolicy" mapstructure:"ImagePullPolicy"`
-	ForceImagePullPolicy     bool              `json:"ForceImagePullPolicy,omitempty" mapstructure:"ForceImagePullPolicy"`
-	ImagePullSecrets         string            `json:"ImagePullSecrets" mapstructure:"ImagePullSecrets"`
-	CustomAnnotations        map[string]string `json:"CustomAnnotations,omitempty" mapstructure:"CustomAnnotations"`
-	AggregatorPermissions    string            `json:"AggregatorPermissions" mapstructure:"AggregatorPermissions"`
-	ServiceAccountName       string            `json:"ServiceAccountName" mapstructure:"ServiceAccountName"`
-	ExistingServiceAccount   bool              `json:"ExistingServiceAccount,omitempty" mapstructure:"ExistingServiceAccount,omitempty"`
-	E2EDockerConfigFile      string            `json:"E2EDockerConfigFile,omitempty" mapstructure:"E2EDockerConfigFile,omitempty"`
-	NamespacePSAEnforceLevel string            `json:"NamespacePSAEnforceLevel,omitempty" mapstructure:"NamespacePSAEnforceLevel,omitempty"`
+	WorkerImage              string              `json:"WorkerImage" mapstructure:"WorkerImage"`
+	ImagePullPolicy          string              `json:"ImagePullPolicy" mapstructure:"ImagePullPolicy"`
+	ForceImagePullPolicy     bool                `json:"ForceImagePullPolicy,omitempty" mapstructure:"ForceImagePullPolicy"`
+	ImagePullSecrets         string              `json:"ImagePullSecrets" mapstructure:"ImagePullSecrets"`
+	CustomAnnotations        map[string]string   `json:"CustomAnnotations,omitempty" mapstructure:"CustomAnnotations"`
+	AggregatorPermissions    string              `json:"AggregatorPermissions" mapstructure:"AggregatorPermissions"`
+	AggregatorTolerations    []map[string]string `json:"AggregatorTolerations,omitempty" mapstructure:"AggregatorTolerations"`
+	ServiceAccountName       string              `json:"ServiceAccountName" mapstructure:"ServiceAccountName"`
+	ExistingServiceAccount   bool                `json:"ExistingServiceAccount,omitempty" mapstructure:"ExistingServiceAccount,omitempty"`
+	E2EDockerConfigFile      string              `json:"E2EDockerConfigFile,omitempty" mapstructure:"E2EDockerConfigFile,omitempty"`
+	NamespacePSAEnforceLevel string              `json:"NamespacePSAEnforceLevel,omitempty" mapstructure:"NamespacePSAEnforceLevel,omitempty"`
 
 	// ProgressUpdatesPort is the port on which the Sonobuoy worker will listen for status updates from its plugin.
 	ProgressUpdatesPort string `json:"ProgressUpdatesPort,omitempty" mapstructure:"ProgressUpdatesPort"`

scripts/build_funcs.sh

@@ -13,7 +13,7 @@ LINUX_ARCH=(amd64 arm64 ppc64le s390x)
 
 # Currently only under a single arch, can iterate over these and still assume arch value.
 WIN_ARCH=amd64
-WINVERSIONS=("1809" "1903" "1909" "2004" "20H2")
+WINVERSIONS=("ltsc2022")
 
 # Not used for pushing images, just for local building on other GOOS. Defaults to
 # grabbing from the local go env but can be set manually to avoid that requirement.
@@ -28,14 +28,14 @@ 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.20
+BUILD_IMAGE=golang:1.23.1
 AMD_IMAGE=gcr.io/distroless/static:nonroot
 ARM_IMAGE=gcr.io/distroless/static:nonroot-arm64
 PPC64LE_IMAGE=gcr.io/distroless/static:nonroot-ppc64le
 S390X_IMAGE=gcr.io/distroless/static:nonroot-s390x
 WIN_AMD64_BASEIMAGE=mcr.microsoft.com/windows/nanoserver
 TEST_IMAGE=testimage:v0.1
-LINT_IMAGE=golangci/golangci-lint:v1.52.2
+LINT_IMAGE=golangci/golangci-lint:v1.61.0
 KIND_CLUSTER=kind
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )"
@@ -84,7 +84,7 @@ local_integration(){
 }
 
 lint() {
-  docker run --rm -v "$(pwd)":$BUILDMNT -w $BUILDMNT $LINT_IMAGE /bin/sh -c \
+  docker run --rm -v "$(pwd)":$BUILDMNT -w $BUILDMNT $LINT_IMAGE /bin/sh -c \F
     "golangci-lint run --out-format=github-actions --timeout=5m0s -v"
 }
 
@@ -107,7 +107,7 @@ build_container_dockerfile_arch() {
 buildx_container_windows_version(){
     mkdir -p "build/windows/$WIN_ARCH/$VERSION"
     docker buildx build --pull \
-        --output=type=oci,dest=build/windows/$WIN_ARCH/$VERSION/sonobuoy-img-win-$WIN_ARCH-$VERSION-$GITHUB_RUN_ID.tar \
+        --output=type=docker,dest=build/windows/$WIN_ARCH/$VERSION/sonobuoy-img-win-$WIN_ARCH-$VERSION-$GITHUB_RUN_ID.tar \
         --platform windows/amd64 \
         -t $REGISTRY/$TARGET:win-$WIN_ARCH-$VERSION-$IMAGE_VERSION \
         --build-arg VERSION=$1 \

scripts/update_docs.sh

@@ -118,7 +118,7 @@ fi
 
 docker run --rm \
   -v "${DIR}":/root \
-  debian:stretch-slim \
+  debian:bookworm-slim \
   /bin/sh -c \
   "rm -rf /root/site/content/docs/${VERSION} && \
   cp -r /root/site/content/docs/main /root/site/content/docs/${VERSION} && \

site/config.yaml

@@ -32,9 +32,12 @@ params:
   docs_search_index_name: index_name
   docs_search_api_key: api_key
   docs_versioning: true
-  docs_latest: v0.56.17
+  docs_latest: v0.57.2
   docs_versions:
     - main
+    - v0.57.2
+    - v0.57.1
+    - v0.57.0
     - v0.56.17
     - v0.56.15
     - v0.56.14

site/content/docs/main/cli/sonobuoy.md

@@ -35,4 +35,4 @@ sonobuoy [flags]
 * [sonobuoy version](sonobuoy_version.md)	 - Print sonobuoy version
 * [sonobuoy wait](sonobuoy_wait.md)	 - Waits on the Sonobuoy run in the targeted namespace.
 
-###### Auto generated by spf13/cobra on 15-Jun-2023
+###### Auto generated by spf13/cobra on 27-Aug-2024

site/content/docs/main/cli/sonobuoy_delete.md

@@ -11,6 +11,7 @@ sonobuoy delete [flags]
 ```
       --all                     In addition to deleting Sonobuoy namespaces, also clean up dangling e2e namespaces (those with 'e2e-framework' and 'e2e-run' labels).
       --context string          Context in the kubeconfig to use.
+      --dry-run                 If true, only print the image operations that would be performed.
   -h, --help                    help for delete
       --kubeconfig Kubeconfig   Path to explicit kubeconfig file.
   -n, --namespace string        The namespace to run Sonobuoy in. Only one Sonobuoy run can exist per namespace simultaneously. (default "sonobuoy")
@@ -29,4 +30,4 @@ sonobuoy delete [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
-###### Auto generated by spf13/cobra on 15-Jun-2023
+###### Auto generated by spf13/cobra on 27-Aug-2024

site/content/docs/main/cli/sonobuoy_e2e.md

@@ -29,4 +29,4 @@ sonobuoy e2e [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
-###### Auto generated by spf13/cobra on 15-Jun-2023
+###### Auto generated by spf13/cobra on 27-Aug-2024

site/content/docs/main/cli/sonobuoy_gen.md

@@ -15,6 +15,7 @@ sonobuoy gen [flags]
       --context string                           Context in the kubeconfig to use.
       --dns-namespace string                     The namespace to check for DNS pods during preflight checks. (default "kube-system")
       --dns-pod-labels strings                   The label selectors to use for locating DNS pods during preflight checks. Can be specified multiple times or as a comma-separated list. (default [k8s-app=kube-dns,k8s-app=coredns])
+      --e2e-docker-config-file json-filepath     A docker credentials configuration file used which contains authorization token that can be used to pull images from certain private registries provided by the users
       --e2e-focus envModifier                    Specify the E2E_FOCUS value for the e2e plugin, specifying which tests to run. Shorthand for --plugin-env=e2e.E2E_FOCUS=<string> (default \[Conformance\])
       --e2e-repo envModifier                     Specify a registry to use as the default for pulling Kubernetes test images. Same as providing --e2e-repo-config but specifying the same repo repeatedly.
       --e2e-repo-config yaml-filepath            Specify a yaml file acting as KUBE_TEST_REPO_LIST, overriding registries for test images.
@@ -39,7 +40,7 @@ sonobuoy gen [flags]
       --service-account-name string              Name of the service account to be used by sonobuoy. (default "sonobuoy-serviceaccount")
       --show-default-podspec                     If true, include the default pod spec used for plugins in the output.
       --skip-preflight strings[=true]            Skips the specified preflight checks. Valid values are [dnscheck, versioncheck, existingnamespace] or true to skip all of the checks.
-      --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:1c88db1e")
+      --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:v0.57.2")
       --ssh-key yamlFile                         Path to the private key enabling SSH to cluster nodes. May be required by some tests from the e2e plugin.
       --ssh-user envModifier                     SSH user for ssh-key. Required if running e2e plugin with certain tests that require SSH access to nodes.
       --systemd-logs-image image                 Container image override for the systemd-logs plugin. Shorthand for --plugin-image=systemd-logs:<string> (default map[])
@@ -61,4 +62,4 @@ sonobuoy gen [flags]
 * [sonobuoy gen default-image-config](sonobuoy_gen_default-image-config.md)	 - Generates the default image registry config for the e2e plugin
 * [sonobuoy gen plugin](sonobuoy_gen_plugin.md)	 - Generates the manifest Sonobuoy uses to define a plugin
 
-###### Auto generated by spf13/cobra on 15-Jun-2023
+###### Auto generated by spf13/cobra on 27-Aug-2024

site/content/docs/main/cli/sonobuoy_gen_config.md

@@ -15,6 +15,7 @@ sonobuoy gen config [flags]
       --context string                           Context in the kubeconfig to use.
       --dns-namespace string                     The namespace to check for DNS pods during preflight checks. (default "kube-system")
       --dns-pod-labels strings                   The label selectors to use for locating DNS pods during preflight checks. Can be specified multiple times or as a comma-separated list. (default [k8s-app=kube-dns,k8s-app=coredns])
+      --e2e-docker-config-file json-filepath     A docker credentials configuration file used which contains authorization token that can be used to pull images from certain private registries provided by the users
       --e2e-focus envModifier                    Specify the E2E_FOCUS value for the e2e plugin, specifying which tests to run. Shorthand for --plugin-env=e2e.E2E_FOCUS=<string> (default \[Conformance\])
       --e2e-repo envModifier                     Specify a registry to use as the default for pulling Kubernetes test images. Same as providing --e2e-repo-config but specifying the same repo repeatedly.
       --e2e-repo-config yaml-filepath            Specify a yaml file acting as KUBE_TEST_REPO_LIST, overriding registries for test images.
@@ -39,7 +40,7 @@ sonobuoy gen config [flags]
       --service-account-name string              Name of the service account to be used by sonobuoy. (default "sonobuoy-serviceaccount")
       --show-default-podspec                     If true, include the default pod spec used for plugins in the output.
       --skip-preflight strings[=true]            Skips the specified preflight checks. Valid values are [dnscheck, versioncheck, existingnamespace] or true to skip all of the checks.
-      --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:1c88db1e")
+      --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:v0.57.2")
       --ssh-key yamlFile                         Path to the private key enabling SSH to cluster nodes. May be required by some tests from the e2e plugin.
       --ssh-user envModifier                     SSH user for ssh-key. Required if running e2e plugin with certain tests that require SSH access to nodes.
       --systemd-logs-image image                 Container image override for the systemd-logs plugin. Shorthand for --plugin-image=systemd-logs:<string> (default map[])
@@ -58,4 +59,4 @@ sonobuoy gen config [flags]
 
 * [sonobuoy gen](sonobuoy_gen.md)	 - Generates a sonobuoy manifest for submission via kubectl
 
-###### Auto generated by spf13/cobra on 15-Jun-2023
+###### Auto generated by spf13/cobra on 27-Aug-2024

site/content/docs/main/cli/sonobuoy_gen_default-image-config.md

@@ -24,4 +24,4 @@ sonobuoy gen default-image-config [flags]
 
 * [sonobuoy gen](sonobuoy_gen.md)	 - Generates a sonobuoy manifest for submission via kubectl
 
-###### Auto generated by spf13/cobra on 15-Jun-2023
+###### Auto generated by spf13/cobra on 27-Aug-2024

site/content/docs/main/cli/sonobuoy_gen_plugin.md

@@ -42,4 +42,4 @@ sonobuoy gen plugin -n myPlugin -i myregistry/myimage:v0
 * [sonobuoy gen plugin e2e](sonobuoy_gen_plugin_e2e.md)	 - Generates the e2e plugin definition based on the given options
 * [sonobuoy gen plugin systemd-logs](sonobuoy_gen_plugin_systemd-logs.md)	 - Generates the systemd-logs plugin definition based on the given options
 
-###### Auto generated by spf13/cobra on 15-Jun-2023
+###### Auto generated by spf13/cobra on 27-Aug-2024