Query ServerGroups to see supported API versions

config.json

@@ -34,6 +34,7 @@
         "ResourceQuotas",
         "RoleBindings",
         "Roles",
+        "ServerGroups",
         "ServiceAccounts",
         "Services",
         "StatefulSets"

docs/configuration.md

@@ -72,6 +72,7 @@ See [Parameter Reference][3] for a more detailed description of each setting.
         "RoleBindings",
         "Roles",
         "Secrets",
+        "ServerGroups",
         "ServiceAccounts",
         "Services",
         "StatefulSets"

examples/ksonnet/components/10-configmaps.jsonnet

@@ -64,6 +64,7 @@ local sonobuoyConfigData = {
         "ResourceQuotas",
         "RoleBindings",
         "Roles",
+        "ServerGroups",
         "ServiceAccounts",
         "Services",
         "StatefulSets"

examples/quickstart/aggregate.yaml

@@ -91,6 +91,7 @@ data:
             "ResourceQuotas",
             "RoleBindings",
             "Roles",
+            "ServerGroups",
             "ServiceAccounts",
             "Services",
             "StatefulSets"

examples/quickstart/components/10-configmaps.yaml

@@ -48,6 +48,7 @@ data:
             "ResourceQuotas",
             "RoleBindings",
             "Roles",
+            "ServerGroups",
             "ServiceAccounts",
             "Services",
             "StatefulSets"

pkg/config/config.go

@@ -35,7 +35,6 @@ var ClusterResources = []string{
 	"Nodes",
 	"PersistentVolumes",
 	"PodSecurityPolicies",
-	"ServerVersion",
 	"StorageClasses",
 	"ThirdPartyResources",
 }
@@ -55,7 +54,6 @@ var NamespacedResources = []string{
 	"LimitRanges",
 	"PersistentVolumeClaims",
 	"PodDisruptionBudgets",
-	"PodLogs",
 	"PodPresets",
 	"PodTemplates",
 	"Pods",
@@ -70,6 +68,14 @@ var NamespacedResources = []string{
 	"StatefulSets",
 }
 
+// SpecialResources are resources that aren't queried (or stored) the same was
+// as the rest, so need special casing for querying them.
+var SpecialResources = []string{
+	"PodLogs",
+	"ServerGroups",
+	"ServerVersion",
+}
+
 // FilterOptions allow operators to select sets to include in a report
 type FilterOptions struct {
 	Namespaces    string `json:"Namespaces"`
@@ -147,6 +153,7 @@ func NewWithDefaults() *Config {
 
 	cfg.Resources = ClusterResources
 	cfg.Resources = append(cfg.Resources, NamespacedResources...)
+	cfg.Resources = append(cfg.Resources, SpecialResources...)
 
 	cfg.PluginNamespace = metav1.NamespaceSystem
 

pkg/discovery/queries.go

@@ -216,16 +216,13 @@ func QueryNSResources(kubeClient kubernetes.Interface, recorder *QueryRecorder,
 
 	// 3. Execute the ns-query
 	for resourceKind := range resources {
-		// We use annotations to tag resources as being namespaced vs not, skip any
-		// that aren't "ns"
-		if resourceKind != "PodLogs" {
-			lister := func() (runtime.Object, error) { return queryNsResource(ns, resourceKind, opts, kubeClient) }
-			query := func() (time.Duration, error) { return objListQuery(outdir+"/", resourceKind+".json", lister) }
-			timedQuery(recorder, resourceKind, ns, query)
-		}
+		lister := func() (runtime.Object, error) { return queryNsResource(ns, resourceKind, opts, kubeClient) }
+		query := func() (time.Duration, error) { return objListQuery(outdir+"/", resourceKind+".json", lister) }
+		timedQuery(recorder, resourceKind, ns, query)
 	}
 
-	if resources["PodLogs"] {
+	specialResources := cfg.FilterResources(config.SpecialResources)
+	if specialResources["PodLogs"] {
 		start := time.Now()
 		err := gatherPodLogs(kubeClient, ns, opts, cfg)
 		if err != nil {
@@ -257,12 +254,9 @@ func QueryClusterResources(kubeClient kubernetes.Interface, recorder *QueryRecor
 
 	// 2. Execute the non-ns-query
 	for resourceKind := range resources {
-		// Eliminate special cases.
-		if resourceKind != "ServerVersion" {
-			lister := func() (runtime.Object, error) { return queryNonNsResource(resourceKind, kubeClient) }
-			query := func() (time.Duration, error) { return objListQuery(outdir+"/", resourceKind+".json", lister) }
-			timedQuery(recorder, resourceKind, "", query)
-		}
+		lister := func() (runtime.Object, error) { return queryNonNsResource(resourceKind, kubeClient) }
+		query := func() (time.Duration, error) { return objListQuery(outdir+"/", resourceKind+".json", lister) }
+		timedQuery(recorder, resourceKind, "", query)
 	}
 
 	// cfg.Nodes configures whether users want to gather the Nodes resource in the
@@ -277,13 +271,22 @@ func QueryClusterResources(kubeClient kubernetes.Interface, recorder *QueryRecor
 		recorder.RecordQuery("Nodes", "", duration, err)
 	}
 
-	if resources["ServerVersion"] {
+	specialResources := cfg.FilterResources(config.SpecialResources)
+	if specialResources["ServerVersion"] {
 		objqry := func() (interface{}, error) { return kubeClient.Discovery().ServerVersion() }
 		query := func() (time.Duration, error) {
 			return untypedQuery(cfg.OutputDir(), "serverversion.json", objqry)
 		}
 		timedQuery(recorder, "serverversion", "", query)
 	}
 
+	if specialResources["ServerGroups"] {
+		objqry := func() (interface{}, error) { return kubeClient.Discovery().ServerGroups() }
+		query := func() (time.Duration, error) {
+			return untypedQuery(cfg.OutputDir(), "servergroups.json", objqry)
+		}
+		timedQuery(recorder, "servergroups", "", query)
+	}
+
 	return nil
 }

pkg/discovery/queryrecorder.go

@@ -21,6 +21,9 @@ import (
 	"os"
 	"path"
 	"time"
+
+	"github.com/heptio/sonobuoy/pkg/errlog"
+	"github.com/pkg/errors"
 )
 
 type QueryRecorder struct {
@@ -42,6 +45,9 @@ type queryData struct {
 }
 
 func (q *QueryRecorder) RecordQuery(name string, namespace string, duration time.Duration, recerr error) {
+	if recerr != nil {
+		errlog.LogError(errors.Wrapf(recerr, "error querying %v", name))
+	}
 	summary := &queryData{
 		QueryObj:    name,
 		Namespace:   namespace,