Merge pull request #576 from replicatedhq/emosbaugh/fix-run-collector-text-analyze

Fix run collector text analyze file path mismatch

.github/workflows/build-test-deploy.yaml

@@ -7,9 +7,13 @@ on:
       - "main"
     tags:
       - "v*.*.*"
-  
+
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  build:
+  test:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/setup-go@v1
@@ -24,11 +28,10 @@ jobs:
 
       - uses: actions/checkout@v2
 
-      - run: make 
-  
+      - run: make test
+
   compile-preflight:
     runs-on: ubuntu-latest
-    needs: build
     steps:
       - uses: actions/setup-go@v1
         with:
@@ -39,22 +42,25 @@ jobs:
           echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
         shell: bash
       - uses: actions/checkout@master
-      - run: make preflight
+      - run: make generate preflight
       - uses: actions/upload-artifact@v1
         with:
           name: preflight
           path: bin/preflight
-        
+
   validate-preflight:
     runs-on: ubuntu-latest
     needs: compile-preflight
     steps:
+      - uses: replicatedhq/action-k3s@main
+        id: k3s
+        with:
+          version: v1.23.6-k3s1
       - name: Download preflight binary
         uses: actions/download-artifact@v1
         with:
           name: preflight
           path: bin/
-      - uses: engineerd/setup-kind@v0.5.0
       - run: chmod +x bin/preflight
       - run: |
           ./bin/preflight --interactive=false --format=json https://preflight.replicated.com > result.json
@@ -83,9 +89,50 @@ jobs:
 
           exit $EXIT_STATUS
 
+  validate-preflight-e2e:
+    runs-on: ubuntu-latest
+    needs: compile-preflight
+    steps:
+      - uses: actions/checkout@master
+      - uses: replicatedhq/action-k3s@main
+        id: k3s
+        with:
+          version: v1.23.6-k3s1
+      - name: Download preflight binary
+        uses: actions/download-artifact@v1
+        with:
+          name: preflight
+          path: bin/
+      - run: chmod +x bin/preflight
+      - run: |
+          ./bin/preflight --interactive=false --format=json examples/preflight/e2e.yaml > result.json
+          cat result.json
+
+          EXIT_STATUS=0
+          if grep -q "was not collected" result.json; then
+            echo "Some files were not collected"
+            EXIT_STATUS=1
+          fi
+
+          if (( `jq '.pass | length' result.json` < 1 )); then
+            echo "No passing preflights found"
+            EXIT_STATUS=1
+          fi
+
+          if (( `jq '.warn | length' result.json` > 0 )); then
+            echo "Warnings found"
+            EXIT_STATUS=1
+          fi
+
+          if (( `jq '.fail | length' result.json` > 0 )); then
+            echo "Failed preflights found"
+            EXIT_STATUS=1
+          fi
+
+          exit $EXIT_STATUS
+
   compile-supportbundle:
     runs-on: ubuntu-latest
-    needs: build
     steps:
       - uses: actions/setup-go@v1
         with:
@@ -96,7 +143,7 @@ jobs:
           echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
         shell: bash
       - uses: actions/checkout@master
-      - run: make support-bundle
+      - run: make generate support-bundle
       - uses: actions/upload-artifact@v1
         with:
           name: support-bundle
@@ -107,27 +154,48 @@ jobs:
     needs: compile-supportbundle
     steps:
       - uses: actions/checkout@v1
+      - uses: replicatedhq/action-k3s@main
+        id: k3s
+        with:
+          version: v1.23.6-k3s1
       - name: Download support-bundle binary
         uses: actions/download-artifact@v1
         with:
           name: support-bundle
           path: bin/
-      - uses: engineerd/setup-kind@v0.5.0
       - run: chmod +x bin/support-bundle
       - run: ./bin/support-bundle ./examples/support-bundle/sample-collectors.yaml
       - run: ./bin/support-bundle ./examples/support-bundle/sample-supportbundle.yaml
       - run: ./bin/support-bundle https://kots.io
 
+  compile-collect:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v1
+        with:
+          go-version: '1.17'
+      - name: setup env
+        run: |
+          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
+          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+        shell: bash
+      - uses: actions/checkout@master
+      - run: make generate collect
+      - uses: actions/upload-artifact@v1
+        with:
+          name: collect
+          path: bin/collect
+
   goreleaser-test:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/v') != true
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-  
+
       - name: Unshallow
         run: git fetch --prune --unshallow
-  
+
       - uses: actions/setup-go@v1
         with:
           go-version: "1.17"
@@ -142,12 +210,13 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - validate-preflight
+      - validate-preflight-e2e
       - validate-supportbundle
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-  
+
       - uses: azure/docker-login@v1
         with:
           username: repldeploy2
@@ -155,7 +224,7 @@ jobs:
 
       - name: Unshallow
         run: git fetch --prune --unshallow
-  
+
       - uses: actions/setup-go@v1
         with:
           go-version: "1.17"
@@ -169,14 +238,14 @@ jobs:
           echo $COSIGN_KEY | base64 -d > ./cosign.key
         env:
           COSIGN_KEY: ${{secrets.COSIGN_KEY}}
-          
+
       - name: Generate SBOM
         run: |
           make sbom
         env:
           COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
           COSIGN_KEY: ${{ secrets.COSIGN_KEY }}
-   
+
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:

.github/workflows/daily-scan.yaml

@@ -0,0 +1,27 @@
+name: Scan vulnerabilities
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+jobs:
+  scan_troubleshoot_files_systems:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Run Trivy vulnerability scanner in repo mode
+        uses: aquasecurity/trivy-action@master
+        with:
+          scan-type: 'fs'
+          ignore-unfixed: true
+          format: 'sarif'
+          output: 'trivy-results.sarif'
+          severity: 'HIGH,CRITICAL'
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: 'trivy-results.sarif'

Makefile

@@ -35,7 +35,7 @@ endef
 
 BUILDFLAGS = -tags "netgo containers_image_ostree_stub exclude_graphdriver_devicemapper exclude_graphdriver_btrfs containers_image_openpgp" -installsuffix netgo
 
-all: test
+all: test support-bundle preflight collect
 
 .PHONY: ffi
 ffi: fmt vet
@@ -46,19 +46,19 @@ test: generate fmt vet
 	go test ${BUILDFLAGS} ./pkg/... ./cmd/... -coverprofile cover.out
 
 .PHONY: support-bundle
-support-bundle: generate fmt vet
+support-bundle:
 	go build ${BUILDFLAGS} ${LDFLAGS} -o bin/support-bundle github.com/replicatedhq/troubleshoot/cmd/troubleshoot
 
 .PHONY: preflight
-preflight: generate fmt vet
+preflight:
 	go build ${BUILDFLAGS} ${LDFLAGS} -o bin/preflight github.com/replicatedhq/troubleshoot/cmd/preflight
 
 .PHONY: analyze
-analyze: generate fmt vet
+analyze:
 	go build ${BUILDFLAGS} ${LDFLAGS} -o bin/analyze github.com/replicatedhq/troubleshoot/cmd/analyze
 	
 .PHONY: collect
-collect: generate fmt vet
+collect:
 	go build ${BUILDFLAGS} ${LDFLAGS} -o bin/collect github.com/replicatedhq/troubleshoot/cmd/collect	
 
 .PHONY: fmt
@@ -169,3 +169,12 @@ longhorn:
 	find pkg/longhorn -type f | xargs sed -i "s/github.com\/longhorn\/longhorn-manager\/types/github.com\/replicatedhq\/troubleshoot\/pkg\/longhorn\/types/g"
 	find pkg/longhorn -type f | xargs sed -i "s/github.com\/longhorn\/longhorn-manager\/util/github.com\/replicatedhq\/troubleshoot\/pkg\/longhorn\/util/g"
 	rm -rf longhorn-manager
+
+.PHONY: scan
+scan:
+	trivy fs \
+		--security-checks vuln \
+		--exit-code=1 \
+		--severity="HIGH,CRITICAL" \
+		--ignore-unfixed \
+		./

cmd/preflight/cli/interactive_results.go

@@ -139,6 +139,9 @@ func drawPreflightTable(analyzeResults []*analyzerunner.AnalyzeResult) {
 
 	for i, analyzeResult := range analyzeResults {
 		title := analyzeResult.Title
+		if analyzeResult.Strict {
+			title = title + fmt.Sprintf(" (Strict: %t)", analyzeResult.Strict)
+		}
 		if analyzeResult.IsPass {
 			title = fmt.Sprintf("✔  %s", title)
 		} else if analyzeResult.IsWarn {
@@ -255,6 +258,10 @@ func save(preflightName string, outputPath string, analyzeResults []*analyzerunn
 			result = result + fmt.Sprintf("URI: %s\n", analyzeResult.URI)
 		}
 
+		if analyzeResult.Strict {
+			result = result + fmt.Sprintf("Strict: %t\n", analyzeResult.Strict)
+		}
+
 		result = result + "\n------------\n"
 
 		results = results + result

cmd/preflight/cli/stdout_results.go

@@ -42,6 +42,7 @@ func showStdoutResultsJSON(preflightName string, analyzeResults []*analyzerunner
 		Title   string `json:"title"`
 		Message string `json:"message"`
 		URI     string `json:"uri,omitempty"`
+		Strict  bool   `json:"strict,omitempty"`
 	}
 	type Output struct {
 		Pass []ResultOutput `json:"pass,omitempty"`
@@ -62,6 +63,10 @@ func showStdoutResultsJSON(preflightName string, analyzeResults []*analyzerunner
 			URI:     analyzeResult.URI,
 		}
 
+		if analyzeResult.Strict {
+			resultOutput.Strict = analyzeResult.Strict
+		}
+
 		if analyzeResult.IsPass {
 			output.Pass = append(output.Pass, resultOutput)
 		} else if analyzeResult.IsWarn {
@@ -91,6 +96,13 @@ func outputResult(analyzeResult *analyzerunner.AnalyzeResult) bool {
 	} else if analyzeResult.IsFail {
 		fmt.Printf("   --- FAIL: %s\n", analyzeResult.Title)
 		fmt.Printf("      --- %s\n", analyzeResult.Message)
+	}
+
+	if analyzeResult.Strict {
+		fmt.Printf("      --- Strict: %t\n", analyzeResult.Strict)
+	}
+
+	if analyzeResult.IsFail {
 		return true
 	}
 	return false

cmd/preflight/cli/upload_results.go

@@ -17,6 +17,7 @@ func uploadResults(uri string, analyzeResults []*analyzerunner.AnalyzeResult) er
 	}
 	for _, analyzeResult := range analyzeResults {
 		uploadPreflightResult := &preflight.UploadPreflightResult{
+			Strict:  analyzeResult.Strict,
 			IsFail:  analyzeResult.IsFail,
 			IsWarn:  analyzeResult.IsWarn,
 			IsPass:  analyzeResult.IsPass,

config/crds/troubleshoot.sh_analyzers.yaml

@@ -81,6 +81,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - namespace
                       - outcomes
@@ -127,6 +129,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -168,6 +172,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -215,6 +221,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - configMapName
                       - namespace
@@ -258,6 +266,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -301,6 +311,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - customResourceDefinitionName
                       - outcomes
@@ -351,6 +363,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -393,6 +407,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -436,6 +452,8 @@ spec:
                           type: array
                         registryName:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       - registryName
@@ -482,6 +500,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - ingressName
                       - namespace
@@ -533,6 +553,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -579,6 +601,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - namespace
                       - outcomes
@@ -625,6 +649,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -693,6 +719,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -738,6 +766,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -784,6 +814,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -828,6 +860,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -882,6 +916,8 @@ spec:
                           items:
                             type: string
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -931,6 +967,8 @@ spec:
                           type: array
                         secretName:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - namespace
                       - outcomes
@@ -982,6 +1020,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -1026,6 +1066,8 @@ spec:
                           type: array
                         storageClassName:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       - storageClassName
@@ -1068,6 +1110,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -1119,6 +1163,8 @@ spec:
                           type: string
                         regexGroups:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -1130,6 +1176,8 @@ spec:
                           type: BoolString
                         reportFileGlob:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - reportFileGlob
                       type: object

config/crds/troubleshoot.sh_hostcollectors.yaml

@@ -82,6 +82,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - includeUnmountedPartitions
                       - minimumAcceptableSize
@@ -127,6 +129,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -168,6 +172,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -211,6 +217,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -254,6 +262,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -295,6 +305,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -336,6 +348,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -379,6 +393,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -422,6 +438,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -463,6 +481,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -504,6 +524,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -545,6 +567,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -588,6 +612,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -631,6 +657,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -674,6 +702,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -717,6 +747,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -758,6 +790,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object

config/crds/troubleshoot.sh_hostpreflights.yaml

@@ -82,6 +82,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - includeUnmountedPartitions
                       - minimumAcceptableSize
@@ -127,6 +129,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -168,6 +172,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -211,6 +217,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -254,6 +262,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -295,6 +305,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -336,6 +348,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -379,6 +393,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -422,6 +438,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -463,6 +481,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -504,6 +524,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -545,6 +567,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -588,6 +612,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -631,6 +657,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -674,6 +702,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -717,6 +747,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -758,6 +790,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object

config/crds/troubleshoot.sh_preflights.yaml

@@ -81,6 +81,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - namespace
                       - outcomes
@@ -127,6 +129,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -168,6 +172,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -215,6 +221,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - configMapName
                       - namespace
@@ -258,6 +266,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -301,6 +311,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - customResourceDefinitionName
                       - outcomes
@@ -351,6 +363,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -393,6 +407,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -436,6 +452,8 @@ spec:
                           type: array
                         registryName:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       - registryName
@@ -482,6 +500,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - ingressName
                       - namespace
@@ -533,6 +553,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -579,6 +601,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - namespace
                       - outcomes
@@ -625,6 +649,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -693,6 +719,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -738,6 +766,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -784,6 +814,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -828,6 +860,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -882,6 +916,8 @@ spec:
                           items:
                             type: string
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -931,6 +967,8 @@ spec:
                           type: array
                         secretName:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - namespace
                       - outcomes
@@ -982,6 +1020,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -1026,6 +1066,8 @@ spec:
                           type: array
                         storageClassName:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       - storageClassName
@@ -1068,6 +1110,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -1119,6 +1163,8 @@ spec:
                           type: string
                         regexGroups:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -1130,6 +1176,8 @@ spec:
                           type: BoolString
                         reportFileGlob:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - reportFileGlob
                       type: object

config/crds/troubleshoot.sh_supportbundles.yaml

@@ -112,6 +112,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - namespace
                       - outcomes
@@ -158,6 +160,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -199,6 +203,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -246,6 +252,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - configMapName
                       - namespace
@@ -289,6 +297,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -332,6 +342,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - customResourceDefinitionName
                       - outcomes
@@ -382,6 +394,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -424,6 +438,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -467,6 +483,8 @@ spec:
                           type: array
                         registryName:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       - registryName
@@ -513,6 +531,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - ingressName
                       - namespace
@@ -564,6 +584,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -610,6 +632,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - namespace
                       - outcomes
@@ -656,6 +680,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -724,6 +750,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -769,6 +797,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -815,6 +845,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -859,6 +891,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - collectorName
                       - outcomes
@@ -913,6 +947,8 @@ spec:
                           items:
                             type: string
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -962,6 +998,8 @@ spec:
                           type: array
                         secretName:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - namespace
                       - outcomes
@@ -1013,6 +1051,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - name
                       - outcomes
@@ -1057,6 +1097,8 @@ spec:
                           type: array
                         storageClassName:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       - storageClassName
@@ -1099,6 +1141,8 @@ spec:
                                 type: object
                             type: object
                           type: array
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -1150,6 +1194,8 @@ spec:
                           type: string
                         regexGroups:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - outcomes
                       type: object
@@ -1161,6 +1207,8 @@ spec:
                           type: BoolString
                         reportFileGlob:
                           type: string
+                        strict:
+                          type: BoolString
                       required:
                       - reportFileGlob
                       type: object

examples/preflight/e2e.yaml

@@ -0,0 +1,98 @@
+apiVersion: troubleshoot.sh/v1beta2
+kind: Preflight
+metadata:
+  name: example
+spec:
+  collectors:
+    - data:
+        name: config/replicas.txt
+        data: "5"
+    - run:
+        collectorName: "static-hi"
+        image: 'alpine:3.5'
+        command: ["echo", "hi static!"]
+  analyzers:
+    - clusterVersion:
+        outcomes:
+          - fail:
+              when: "< 1.13.0"
+              message: This application requires at least Kubernetes 1.13.0 or later, and recommends 1.15.0.
+              uri: https://www.kubernetes.io
+          - warn:
+              when: "< 1.15.0"
+              message: Your cluster meets the minimum version of Kubernetes, but we recommend you update to 1.15.0 or later.
+              uri: https://kubernetes.io
+          - pass:
+              when: ">= 1.15.0"
+              message: Your cluster meets the recommended and required versions of Kubernetes.
+    - distribution:
+        outcomes:
+          - pass:
+              when: "== k3s"
+              message: K3S is a supported distribution
+          - warn:
+              message: Unable to determine the distribution of Kubernetes
+    - textAnalyze:
+        checkName: Replica Count
+        fileName: config/replicas.txt
+        regexGroups: '(?P<Replicas>\d+)'
+        outcomes:
+          - fail:
+              when: "Replicas < 5"
+              message: That's not enough replicas!
+          - pass:
+              message: You have at least 5 replicas
+    - textAnalyze:
+        checkName: Said hi!
+        fileName: /static-hi.log
+        regex: 'hi static'
+        outcomes:
+          - fail:
+              message: Didn't say hi.
+          - pass:
+              message: Said hi!
+    - nodeResources:
+        checkName: Must be exactly 1 node in the cluster
+        outcomes:
+          - pass:
+              when: "= 1"
+              message: This cluster has exactly 1 node
+          - fail:
+              message: This application requires exactly 1 node
+    - nodeResources:
+        checkName: Must have 1 node with at least 2 cores
+        filters:
+          cpuCapacity: "2"
+        outcomes:
+          - pass:
+              when: "= 1"
+              message: This cluster has exactly 1 node with at least 2 cores
+          - fail:
+              message: This application requires exactly 1 node with at least 2 cores
+    - nodeResources:
+        checkName: Must have 1 node with 2Gi (available) memory and at least 2 cores (on a single node)
+        filters:
+          allocatableMemory: 2Gi
+          cpuCapacity: "2"
+        outcomes:
+          - pass:
+              when: "= 1"
+              message: This cluster has exactly 1 node with at least 2Gi available memory and 2 cores
+          - fail:
+              message: This application requires exactly 1 node with at least 2Gi available memory and 2 cores
+    - nodeResources:
+        checkName: There must be exactly 1 node in the cluster
+        outcomes:
+          - pass:
+              when: "count() = 1"
+              message: This has exactly 1 node in the cluster
+          - fail:
+              message: This application requires exactly 1 node in the cluster
+    - nodeResources:
+        checkName: There must be a total of at least 2Gi of memory on all nodes
+        outcomes:
+          - fail:
+              when: "sum(memoryCapacity) < 2Gi"
+              message: This application requires that 2Gi or more memory be available to the cluster
+          - pass:
+              message: This cluster has sufficient memory

examples/support-bundle/mysql-collector.yaml

@@ -0,0 +1,17 @@
+apiVersion: troubleshoot.sh/v1beta2
+kind: SupportBundle
+metadata:
+  name: mysql
+spec:
+  collectors:
+    - mysql:
+        collectorName: mysql
+        uri: 'root:my-secret-pw@tcp(localhost:3306)/mysql'
+        parameters:
+          - character_set_server
+          - collation_server
+          - init_connect
+          - innodb_file_format
+          - innodb_large_prefix
+          - innodb_strict_mode
+          - log_bin_trust_function_creators

github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/fake/clientset_generated.go

@@ -75,7 +75,10 @@ func (c *Clientset) Tracker() testing.ObjectTracker {
 	return c.tracker
 }
 
-var _ clientset.Interface = &Clientset{}
+var (
+	_ clientset.Interface = &Clientset{}
+	_ testing.FakeClient  = &Clientset{}
+)
 
 // TroubleshootV1beta1 retrieves the TroubleshootV1beta1Client
 func (c *Clientset) TroubleshootV1beta1() troubleshootv1beta1.TroubleshootV1beta1Interface {

github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/fake/register.go

@@ -29,7 +29,7 @@ import (
 
 var scheme = runtime.NewScheme()
 var codecs = serializer.NewCodecFactory(scheme)
-var parameterCodec = runtime.NewParameterCodec(scheme)
+
 var localSchemeBuilder = runtime.SchemeBuilder{
 	troubleshootv1beta1.AddToScheme,
 	troubleshootv1beta2.AddToScheme,

go.mod

@@ -5,7 +5,7 @@ go 1.17
 require (
 	github.com/ahmetalpbalkan/go-cursor v0.0.0-20131010032410-8136607ea412
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/containers/image/v5 v5.17.0
+	github.com/containers/image/v5 v5.19.3
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/fatih/color v1.13.0
 	github.com/go-redis/redis/v7 v7.4.1
@@ -13,6 +13,7 @@ require (
 	github.com/gobwas/glob v0.2.3
 	github.com/godbus/dbus v4.1.0+incompatible
 	github.com/google/gofuzz v1.2.0
+	github.com/google/uuid v1.3.0
 	github.com/gorilla/handlers v1.5.1
 	github.com/hashicorp/go-getter v1.5.9
 	github.com/hashicorp/go-multierror v1.1.1
@@ -23,13 +24,12 @@ require (
 	github.com/mholt/archiver v3.1.1+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/replicatedhq/termui/v3 v3.1.1-0.20200811145416-f40076d26851
-	github.com/satori/go.uuid v1.2.0
 	github.com/segmentio/ksuid v1.0.4
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/cobra v1.2.1
+	github.com/spf13/cobra v1.3.0
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.9.0
+	github.com/spf13/viper v1.10.0
 	github.com/stretchr/testify v1.7.0
 	github.com/tj/go-spin v1.1.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
@@ -45,7 +45,7 @@ require (
 )
 
 require (
-	cloud.google.com/go v0.93.3 // indirect
+	cloud.google.com/go v0.99.0 // indirect
 	cloud.google.com/go/storage v1.10.0 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest v0.11.18 // indirect
@@ -53,26 +53,27 @@ require (
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/BurntSushi/toml v0.4.1 // indirect
-	github.com/Microsoft/go-winio v0.5.0 // indirect
-	github.com/Microsoft/hcsshim v0.8.22 // indirect
+	github.com/BurntSushi/toml v1.0.0 // indirect
+	github.com/Microsoft/go-winio v0.5.1 // indirect
+	github.com/Microsoft/hcsshim v0.9.2 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/aws/aws-sdk-go v1.15.78 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/c9s/goprocinfo v0.0.0-20170724085704-0010a05ce49f // indirect
-	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/chzyer/logex v1.1.11-0.20160617073814-96a4d311aa9b // indirect
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
 	github.com/containerd/cgroups v1.0.1 // indirect
-	github.com/containerd/containerd v1.5.7 // indirect
-	github.com/containerd/stargz-snapshotter/estargz v0.9.0 // indirect
+	github.com/containerd/containerd v1.5.10 // indirect
+	github.com/containerd/stargz-snapshotter/estargz v0.11.0 // indirect
 	github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b // indirect
-	github.com/containers/ocicrypt v1.1.2 // indirect
-	github.com/containers/storage v1.37.0 // indirect
+	github.com/containers/ocicrypt v1.1.4 // indirect
+	github.com/containers/storage v1.38.3 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/docker v20.10.11+incompatible // indirect
+	github.com/docker/docker v20.10.12+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.6.4 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
@@ -99,8 +100,7 @@ require (
 	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/google/go-intervals v0.0.2 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.1.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.1.1 // indirect
 	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
@@ -114,12 +114,12 @@ require (
 	github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/klauspost/compress v1.14.2 // indirect
 	github.com/klauspost/pgzip v1.2.5 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/mattn/go-colorable v0.1.9 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/mattn/go-shellwords v1.0.12 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
@@ -127,19 +127,19 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
 	github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
-	github.com/mitchellh/mapstructure v1.4.2 // indirect
+	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
-	github.com/moby/sys/mountinfo v0.4.1 // indirect
+	github.com/moby/sys/mountinfo v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d // indirect
 	github.com/nwaples/rardecode v1.1.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.0.2-0.20210819154149-5ad6f50d6283 // indirect
-	github.com/opencontainers/runc v1.0.2 // indirect
+	github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84 // indirect
+	github.com/opencontainers/runc v1.1.0 // indirect
 	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
-	github.com/opencontainers/selinux v1.9.1 // indirect
+	github.com/opencontainers/selinux v1.10.0 // indirect
 	github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
@@ -154,6 +154,7 @@ require (
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/sylabs/sif/v2 v2.3.1 // indirect
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
 	github.com/tchap/go-patricia v2.3.0+incompatible // indirect
 	github.com/tklauser/go-sysconf v0.3.9 // indirect
@@ -165,20 +166,21 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	go.opencensus.io v0.23.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
 	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
-	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
-	golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
+	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
+	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
 	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	google.golang.org/api v0.56.0 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/api v0.62.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20211005153810-c76a74d43a8e // indirect
-	google.golang.org/grpc v1.41.0 // indirect
+	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
+	google.golang.org/grpc v1.42.0 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.63.2 // indirect
+	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	k8s.io/klog/v2 v2.30.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect

go.sum

@@ -23,8 +23,12 @@ cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAV
 cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
 cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
 cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
-cloud.google.com/go v0.93.3 h1:wPBktZFzYBcCZVARvwVKqH1uEj+aLXofJEtrb4oOsio=
 cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
+cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
+cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
+cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM=
+cloud.google.com/go v0.99.0 h1:y/cM2iqGgGi5D5DQZl6D9STN/3dR/Vx5Mp8s752oJTY=
+cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
@@ -34,7 +38,7 @@ cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM7
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
-cloud.google.com/go/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU=
+cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -74,9 +78,10 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
-github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU=
+github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
@@ -85,8 +90,9 @@ github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugX
 github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
-github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
 github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
+github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY=
+github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
 github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
 github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
@@ -95,20 +101,27 @@ github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2
 github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00=
 github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
 github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
-github.com/Microsoft/hcsshim v0.8.22 h1:CulZ3GW8sNJExknToo+RWD+U+6ZM5kkNfuxywSDPd08=
-github.com/Microsoft/hcsshim v0.8.22/go.mod h1:91uVCVzvX2QD16sMCenoxxXo6L1wJnLMX2PSufFMtF0=
+github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg=
+github.com/Microsoft/hcsshim v0.9.2 h1:wB06W5aYFfUB3IvootYAY2WnOmIdgPGfqSI6tufQNnY=
+github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
 github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
+github.com/ProtonMail/go-crypto v0.0.0-20210920160938-87db9fbc61c7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
+github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
 github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
+github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
 github.com/ahmetalpbalkan/go-cursor v0.0.0-20131010032410-8136607ea412 h1:vOVO0ypMfTt6tZacyI0kp+iCZb1XSNiYDqnzBWYgfe4=
 github.com/ahmetalpbalkan/go-cursor v0.0.0-20131010032410-8136607ea412/go.mod h1:AI9hp1tkp10pAlK5TCwL+7yWbRgtDm9jhToq6qij2xs=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -117,13 +130,16 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
+github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.15.78 h1:LaXy6lWR0YK7LKyuU0QWy2ws/LWTPfYV/UgfiBu4tvY=
@@ -145,6 +161,7 @@ github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqO
 github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
 github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
@@ -153,15 +170,19 @@ github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0Bsq
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/c9s/goprocinfo v0.0.0-20170724085704-0010a05ce49f h1:tRk+aBit+q3oqnj/1mF5HHhP2yxJM2lSa0afOJxQ3nE=
 github.com/c9s/goprocinfo v0.0.0-20170724085704-0010a05ce49f/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE=
+github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
 github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
+github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
 github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/logex v1.1.11-0.20160617073814-96a4d311aa9b h1:i4AJWjdpwyE7iKKxsp8NbWy3gQVQ9nZEBG/Pm+cBaww=
@@ -175,12 +196,20 @@ github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLI
 github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
 github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
 github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
+github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
 github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
@@ -205,6 +234,7 @@ github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on
 github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE=
 github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw=
 github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ=
+github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
 github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
@@ -219,8 +249,10 @@ github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo
 github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI=
 github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
 github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
-github.com/containerd/containerd v1.5.7 h1:rQyoYtj4KddB3bxG6SAqd4+08gePNyJjRqvOIfV3rkM=
 github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
+github.com/containerd/containerd v1.5.9/go.mod h1:fvQqCfadDGga5HZyn3j4+dx56qj2I9YwBrlSdalvJYQ=
+github.com/containerd/containerd v1.5.10 h1:3cQ2uRVCkJVcx5VombsE7105Gl9Wrl7ORAO3+4+ogf4=
+github.com/containerd/containerd v1.5.10/go.mod h1:fvQqCfadDGga5HZyn3j4+dx56qj2I9YwBrlSdalvJYQ=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
@@ -248,13 +280,15 @@ github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJ
 github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c=
 github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
 github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
-github.com/containerd/stargz-snapshotter/estargz v0.9.0 h1:PkB6BSTfOKX23erT2GkoUKkJEcXfNcyKskIViK770v8=
-github.com/containerd/stargz-snapshotter/estargz v0.9.0/go.mod h1:aE5PCyhFMwR8sbrErO5eM2GcvkyXTTJremG883D4qF0=
+github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM=
+github.com/containerd/stargz-snapshotter/estargz v0.11.0 h1:t0IW5kOmY7AXDAWRUs2uVzDhijAUOAYVr/dyRhOQvBg=
+github.com/containerd/stargz-snapshotter/estargz v0.11.0/go.mod h1:/KsZXsJRllMbTKFfG0miFQWViQKdI9+9aSXs+HN0+ac=
 github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
 github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
 github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8=
 github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
 github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
+github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ=
 github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
 github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk=
 github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg=
@@ -269,17 +303,17 @@ github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ
 github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
 github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM=
 github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8=
-github.com/containers/image/v5 v5.17.0 h1:KS5pro80CCsSp5qDBTMmSAWQo+xcBX19zUPExmYX2OQ=
-github.com/containers/image/v5 v5.17.0/go.mod h1:GnYVusVRFPMMTAAUkrcS8NNSpBp8oyrjOUe04AAmRr4=
+github.com/containers/image/v5 v5.19.3 h1:XljZWtaMNJOh9fE8IQyir+bw+7PhxnIwc2/kDF9GPoQ=
+github.com/containers/image/v5 v5.19.3/go.mod h1:9nqGCbwNy4nrjykPRuxJL0aJG5F5CNfv4Nk4U1JezE4=
 github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b h1:Q8ePgVfHDplZ7U33NwHZkrVELsZP5fYj9pM5WBZB2GE=
 github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
 github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc=
 github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4=
 github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY=
-github.com/containers/ocicrypt v1.1.2 h1:Ez+GAMP/4GLix5Ywo/fL7O0nY771gsBIigiqUm1aXz0=
-github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY=
-github.com/containers/storage v1.37.0 h1:HVhDsur6sx889ZIZ1d1kEiOzv3gsr5q0diX2VZmOdSg=
-github.com/containers/storage v1.37.0/go.mod h1:kqeJeS0b7DO2ZT1nVWs0XufrmPFbgV3c+Q/45RlH6r4=
+github.com/containers/ocicrypt v1.1.4 h1:V0ktirShnF1iJ2ithuoYE4eNAOSL3af1PlTiykv3PLQ=
+github.com/containers/ocicrypt v1.1.4/go.mod h1:xpdkbVAuaH3WzbEabUd5yDsl9SwJA5pABH85425Es2g=
+github.com/containers/storage v1.38.3 h1:GP1JU51sgwuqEu4+Lp8taBsqbkHgHVqzb/uzqZF9HOc=
+github.com/containers/storage v1.38.3/go.mod h1:INP0RPLHWBxx+pTsO5uiHlDUGHDFvWZPWprAbAlQWPQ=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -298,10 +332,13 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI=
+github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=
 github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
 github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
@@ -315,12 +352,15 @@ github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
+github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v20.10.11+incompatible h1:OqzI/g/W54LczvhnccGqniFoQghHx3pklbLuhfXpqGo=
-github.com/docker/docker v20.10.11+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v20.10.12+incompatible h1:CEeNmFM0QZIsJCZKMkZx0ZcahTiewkrgiwfYD+dfl1U=
+github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o=
 github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
@@ -348,6 +388,7 @@ github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/El
 github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -356,7 +397,9 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
 github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
@@ -368,6 +411,7 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
@@ -385,8 +429,14 @@ github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49P
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
+github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
+github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
+github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
+github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -405,15 +455,19 @@ github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk=
 github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM=
 github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
@@ -433,6 +487,7 @@ github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7
 github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
 github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -500,6 +555,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
 github.com/google/go-intervals v0.0.2 h1:FGrVEiUnTRKR8yE04qzXYaJMtnIYqobR5QbblK3ixcM=
 github.com/google/go-intervals v0.0.2/go.mod h1:MkaR3LNRfeKLPmqgJYs4E66z5InYjmCjbbr4TQlcT6Y=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -537,8 +593,9 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.1.0 h1:6DWmvNpomjL1+3liNSZbVns3zsYzzCjm6pRBO1tLeso=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
+github.com/googleapis/gax-go/v2 v2.1.1 h1:dp3bWCh+PPO1zjRRiCSczJav13sBvG4UhNyVTa1KqdU=
+github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
 github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
 github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
 github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw=
@@ -548,6 +605,7 @@ github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu
 github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
 github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
 github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
@@ -564,25 +622,29 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
-github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
+github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-getter v1.5.9 h1:b7ahZW50iQiUek/at3CvZhPK1/jiV6CtKcsJiR6E4R0=
 github.com/hashicorp/go-getter v1.5.9/go.mod h1:BrrV/1clo8cCYu6mxvboYg+KutTiFnXjMEgDD8+i7ZI=
 github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
@@ -597,16 +659,21 @@ github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY=
+github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
+github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
+github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
@@ -618,10 +685,13 @@ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7 h1:SMvOWPJCES2GdFracYbBQh93GXac8fq7HeN6JnpduB8=
 github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -629,6 +699,7 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -638,6 +709,8 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/kevinburke/ssh_config v1.1.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -646,8 +719,8 @@ github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0
 github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/klauspost/compress v1.14.2 h1:S0OHlFk/Gbon/yauFJ4FfJJF5V0fc5HbBTJazi28pRw=
+github.com/klauspost/compress v1.14.2/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
@@ -670,13 +743,17 @@ github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
 github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
+github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
 github.com/longhorn/go-iscsi-helper v0.0.0-20210330030558-49a327fb024e h1:hz4quJkaJWDo+xW+G6wTF6d6/95QvJ+o2D0+bB/tJ1U=
 github.com/longhorn/go-iscsi-helper v0.0.0-20210330030558-49a327fb024e/go.mod h1:9z/y9glKmWEdV50tjlUPxFwi1goQfIrrsoZbnMyIZbY=
 github.com/longhorn/nsfilelock v0.0.0-20200723175406-fa7c83ad0003/go.mod h1:0CLeXlf59Lg6C0kjLSDf47ft73Dh37CwymYRKWwAn04=
+github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
+github.com/magefile/mage v1.11.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
@@ -685,11 +762,13 @@ github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
 github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
 github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
 github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
+github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9 h1:sqDoxXbdeALODt0DAeJCVp38ps9ZogZEAXjus69YV3U=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -703,16 +782,20 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
 github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
+github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
 github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
 github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU=
 github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
+github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
 github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
+github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible h1:aKW/4cBs+yK6gpqU3K/oIwk9Q/XICqd3zOX/UFuvqmk=
 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
@@ -729,15 +812,16 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo=
-github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
+github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
 github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
-github.com/moby/sys/mountinfo v0.4.1 h1:1O+1cHA1aujwEwwVMa2Xm2l+gIpUHyd3+D+d7LZh1kM=
 github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
+github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI=
+github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
 github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
 github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 h1:yH0SvLzcbZxcJXho2yh7CqdENGMQe73Cw3woZBpPli0=
@@ -754,14 +838,12 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
-github.com/mtrmac/gpgme v0.1.2/go.mod h1:GYYHnGSuS7HK3zVS2n3y73y0okK/BeKzwnn5jgiVFNI=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d h1:x3S6kxmy49zXVVyhcnrFqxvNVCBPb2KZ9hV2RBdS840=
 github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
@@ -775,9 +857,11 @@ github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:v
 github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
@@ -785,8 +869,10 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
 github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE=
@@ -799,15 +885,17 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/image-spec v1.0.2-0.20210819154149-5ad6f50d6283 h1:TVzvdjOalkJBNkbpPVMAr4KV9QRf2IjfxdyxwAK78Gs=
-github.com/opencontainers/image-spec v1.0.2-0.20210819154149-5ad6f50d6283/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84 h1:g47eG1u/gw0JB7mZ88TcHKCmsy7sWUNZD8ZS9Jhi0O8=
+github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84/go.mod h1:Qnt1q4cjDNQI9bT832ziho5Iw2BhK8o1KwLOwW56VP4=
 github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0=
-github.com/opencontainers/runc v1.0.2 h1:opHZMaswlyxz1OuGpBE53Dwe4/xF7EZTY0A2L/FpCOg=
 github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
+github.com/opencontainers/runc v1.1.0 h1:O9+X96OcDjkmmZyfaG996kV7yq8HsoU2h1XRRQcefG8=
+github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc=
 github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
@@ -819,13 +907,13 @@ github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mo
 github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
 github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
 github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
-github.com/opencontainers/selinux v1.8.5/go.mod h1:HTvjPFoGMbpQsG886e3lQwnsRWtE4TC1OF3OUvG9FAo=
-github.com/opencontainers/selinux v1.9.1 h1:b4VPEF3O5JLZgdTDBmGepaaIbAo0GqoF6EBRq5f/g3Y=
-github.com/opencontainers/selinux v1.9.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
+github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU=
+github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913 h1:TnbXhKzrTOyuvWrjI8W6pcoI9XPbLHFXCdN2dtUw7Rw=
 github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913/go.mod h1:J6OG6YJVEWopen4avK3VNQSnALmmjvniMmni/YFYAwc=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
@@ -846,11 +934,13 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
+github.com/proglottis/gpgme v0.1.1/go.mod h1:fPbW/EZ0LvwQtH8Hy7eixhp1eF3G39dtx7GUN+0Gmy0=
 github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
@@ -865,6 +955,7 @@ github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7q
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.28.0 h1:vGVfV9KrDTvWt5boZO0I19g2E3CsWfpPPKZM9dt3mEw=
@@ -892,18 +983,25 @@ github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYe
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
-github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE=
-github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
+github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/sebdah/goldie/v2 v2.5.3 h1:9ES/mNN+HNUbNWpVAlrzuZ7jE+Nrczbj8uFRjM7624Y=
+github.com/sebdah/goldie/v2 v2.5.3/go.mod h1:oZ9fp0+se1eapSRjfYbsV/0Hqhbuu3bJVvKI/NNtssI=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
+github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
 github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c=
 github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=
-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
+github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
@@ -925,6 +1023,7 @@ github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
+github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
@@ -935,8 +1034,9 @@ github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKv
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
-github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw=
 github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk=
+github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0=
+github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
@@ -949,8 +1049,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
-github.com/spf13/viper v1.9.0 h1:yR6EXjTp0y0cLN8OZg1CRZmOBdI88UcGkhgyJhu6nZk=
-github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4=
+github.com/spf13/viper v1.10.0 h1:mXH0UwHS4D2HwWZa75im4xIQynLfblmWV7qcWpfv0yk=
+github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -968,6 +1068,9 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/sylabs/release-tools v0.1.0/go.mod h1:pqP/z/11/rYMQ0OM/Nn7TxGijw7KfZwW9UolD/J1TUo=
+github.com/sylabs/sif/v2 v2.3.1 h1:NHoc/rZpnOS05etmT+j8IJOZP2Cc8zHHG8rKSVosvZs=
+github.com/sylabs/sif/v2 v2.3.1/go.mod h1:NnvveH62GiibimL00MrI6YYcZfb7DnZMcRo/40giY+0=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=
@@ -984,6 +1087,7 @@ github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcy
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
@@ -996,7 +1100,7 @@ github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX
 github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME=
 github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI=
-github.com/vbauerster/mpb/v7 v7.1.5/go.mod h1:4M8+qAoQqV60WDNktBM5k05i1iTrXE7rjKOHEVkVlec=
+github.com/vbauerster/mpb/v7 v7.3.2/go.mod h1:wfxIZcOJq/bG1/lAtfzMXcOiSvbqVi/5GX5WCSi+IsA=
 github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
@@ -1005,6 +1109,8 @@ github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
+github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
+github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
@@ -1033,8 +1139,11 @@ go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
 go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
+go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
+go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
+go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
 go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0=
 go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE=
 go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc=
@@ -1081,6 +1190,7 @@ golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -1093,8 +1203,13 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
+golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38=
+golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1130,6 +1245,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1180,13 +1296,17 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
+golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY=
 golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1204,8 +1324,10 @@ golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f h1:Qmd2pbz05z7z6lm0DrgQVVPuBm92jqujBKMHMOlOQEw=
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg=
+golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1241,6 +1363,7 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1302,6 +1425,7 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1310,6 +1434,7 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1320,13 +1445,22 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 h1:M69LAlWZCshgp0QSzyDcSsSIejIEeuaCVpmwcKwyLMk=
+golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211001092434-39dca1131b70/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -1344,12 +1478,14 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -1365,6 +1501,7 @@ golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -1393,12 +1530,14 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -1447,8 +1586,13 @@ google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtuk
 google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
 google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
 google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
-google.golang.org/api v0.56.0 h1:08F9XVYTLOGeSQb3xI9C0gXMuQanhdGed0cWFhDozbI=
+google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
 google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
+google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
+google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
+google.golang.org/api v0.62.0 h1:PhGymJMXfGBzc4lBRmrx9+1w4w2wEzURHNGF/sD/xGc=
+google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1487,6 +1631,7 @@ google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
@@ -1517,8 +1662,17 @@ google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwy
 google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20211005153810-c76a74d43a8e h1:Im71rbA1N3CbIag/PumYhQcNR8bLNmuOtRIyOnnLsT8=
-google.golang.org/genproto v0.0.0-20211005153810-c76a74d43a8e/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0=
+google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -1548,8 +1702,9 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ
 google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
 google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
-google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A=
+google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -1572,8 +1727,9 @@ gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20160105164936-4f90aeace3a2/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
@@ -1583,8 +1739,8 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.63.2 h1:tGK/CyBg7SMzb60vP1M03vNZ3VDu3wGQJwn7Sxi9r3c=
-gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
+gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
@@ -1592,6 +1748,7 @@ gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76
 gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -1645,6 +1802,7 @@ k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0=
 k8s.io/client-go v0.23.0/go.mod h1:hrDnpnK1mSr65lHHcUuIZIXDgEbzc7/683c6hyG4jTA=
 k8s.io/client-go v0.23.1 h1:Ma4Fhf/p07Nmj9yAB1H7UwbFHEBrSPg8lviR24U2GiQ=
 k8s.io/client-go v0.23.1/go.mod h1:6QSI8fEuqD4zgFK0xbdwfB/PthBsIxCJMa3s17WlcO0=
+k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0=
 k8s.io/code-generator v0.23.0/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE=
 k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk=
 k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI=
@@ -1655,12 +1813,15 @@ k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI=
 k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI=
 k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw=
 k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4=
@@ -1686,6 +1847,7 @@ sigs.k8s.io/kustomize/api v0.10.1 h1:KgU7hfYoscuqag84kxtzKdEC3mKMb99DPI3a0eaV1d0
 sigs.k8s.io/kustomize/api v0.10.1/go.mod h1:2FigT1QN6xKdcnGS2Ppp1uIWrtWN28Ms8A3OZUZhwr8=
 sigs.k8s.io/kustomize/kyaml v0.13.0 h1:9c+ETyNfSrVhxvphs+K2dzT3dh5oVPPEqPOE/cUpScY=
 sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E=
+sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=

pkg/analyze/analyzer.go

@@ -14,6 +14,7 @@ type AnalyzeResult struct {
 	IsPass bool
 	IsFail bool
 	IsWarn bool
+	Strict bool
 
 	Title   string
 	Message string
@@ -27,7 +28,11 @@ type AnalyzeResult struct {
 type getCollectedFileContents func(string) ([]byte, error)
 type getChildCollectedFileContents func(string) (map[string][]byte, error)
 
-func isExcluded(excludeVal multitype.BoolOrString) (bool, error) {
+func isExcluded(excludeVal *multitype.BoolOrString) (bool, error) {
+	if excludeVal == nil {
+		return false, nil
+	}
+
 	if excludeVal.Type == multitype.Bool {
 		return excludeVal.BoolVal, nil
 	}
@@ -94,6 +99,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.ClusterVersion.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.StorageClass != nil {
@@ -108,6 +114,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.StorageClass.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.CustomResourceDefinition != nil {
@@ -122,6 +129,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.CustomResourceDefinition.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.Ingress != nil {
@@ -136,6 +144,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.Ingress.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.Secret != nil {
@@ -150,6 +159,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.Secret.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.ConfigMap != nil {
@@ -164,6 +174,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.ConfigMap.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.ImagePullSecret != nil {
@@ -178,6 +189,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.ImagePullSecret.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.DeploymentStatus != nil {
@@ -192,6 +204,9 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		for i := range results {
+			results[i].Strict = analyzer.DeploymentStatus.Strict.BoolOrDefaultFalse()
+		}
 		return results, nil
 	}
 	if analyzer.StatefulsetStatus != nil {
@@ -206,6 +221,9 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		for i := range results {
+			results[i].Strict = analyzer.StatefulsetStatus.Strict.BoolOrDefaultFalse()
+		}
 		return results, nil
 	}
 	if analyzer.JobStatus != nil {
@@ -220,6 +238,9 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		for i := range results {
+			results[i].Strict = analyzer.JobStatus.Strict.BoolOrDefaultFalse()
+		}
 		return results, nil
 	}
 	if analyzer.ReplicaSetStatus != nil {
@@ -234,6 +255,9 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		for i := range results {
+			results[i].Strict = analyzer.ReplicaSetStatus.Strict.BoolOrDefaultFalse()
+		}
 		return results, nil
 	}
 	if analyzer.ClusterPodStatuses != nil {
@@ -248,6 +272,9 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		for i := range results {
+			results[i].Strict = analyzer.ClusterPodStatuses.Strict.BoolOrDefaultFalse()
+		}
 		return results, nil
 	}
 	if analyzer.ContainerRuntime != nil {
@@ -262,6 +289,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.ContainerRuntime.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.Distribution != nil {
@@ -276,6 +304,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.Distribution.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.NodeResources != nil {
@@ -290,6 +319,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.NodeResources.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.TextAnalyze != nil {
@@ -300,11 +330,14 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if isExcluded {
 			return nil, nil
 		}
-		multiResult, err := analyzeTextAnalyze(analyzer.TextAnalyze, findFiles)
+		results, err := analyzeTextAnalyze(analyzer.TextAnalyze, findFiles)
 		if err != nil {
 			return nil, err
 		}
-		return multiResult, nil
+		for i := range results {
+			results[i].Strict = analyzer.TextAnalyze.Strict.BoolOrDefaultFalse()
+		}
+		return results, nil
 	}
 	if analyzer.Postgres != nil {
 		isExcluded, err := isExcluded(analyzer.Postgres.Exclude)
@@ -318,6 +351,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.Postgres.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.Mysql != nil {
@@ -332,6 +366,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.Mysql.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.Redis != nil {
@@ -346,6 +381,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.Redis.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.CephStatus != nil {
@@ -360,6 +396,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.CephStatus.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 	if analyzer.Longhorn != nil {
@@ -370,7 +407,14 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if isExcluded {
 			return nil, nil
 		}
-		return longhorn(analyzer.Longhorn, getFile, findFiles)
+		results, err := longhorn(analyzer.Longhorn, getFile, findFiles)
+		if err != nil {
+			return nil, err
+		}
+		for i := range results {
+			results[i].Strict = analyzer.Longhorn.Strict.BoolOrDefaultFalse()
+		}
+		return results, nil
 	}
 
 	if analyzer.RegistryImages != nil {
@@ -385,6 +429,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		result.Strict = analyzer.RegistryImages.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 
@@ -400,6 +445,9 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if err != nil {
 			return nil, err
 		}
+		for i := range results {
+			results[i].Strict = analyzer.WeaveReport.Strict.BoolOrDefaultFalse()
+		}
 		return results, nil
 	}
 
@@ -418,6 +466,7 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		if result == nil {
 			return []*AnalyzeResult{}, nil
 		}
+		result.Strict = analyzer.Sysctl.Strict.BoolOrDefaultFalse()
 		return []*AnalyzeResult{result}, nil
 	}
 

pkg/analyze/ceph.go

@@ -74,7 +74,17 @@ type CephStatus struct {
 }
 
 type HealthStatus struct {
-	Status string `json:"status"`
+	Status string                  `json:"status"`
+	Checks map[string]CheckMessage `json:"checks"`
+}
+
+type CheckMessage struct {
+	Severity string  `json:"severity"`
+	Summary  Summary `json:"summary"`
+}
+
+type Summary struct {
+	Message string `json:"message"`
 }
 
 type OsdMap struct {
@@ -121,6 +131,7 @@ func cephStatus(analyzer *troubleshootv1beta2.CephStatusAnalyze, getCollectedFil
 			if outcome.Fail.When == "" {
 				outcome.Fail.When = string(CephHealthErr)
 			}
+
 			match, err := compareCephStatus(status.Health.Status, outcome.Fail.When)
 			if err != nil {
 				return nil, errors.Wrap(err, "failed to compare ceph status")
@@ -134,6 +145,7 @@ func cephStatus(analyzer *troubleshootv1beta2.CephStatusAnalyze, getCollectedFil
 			if outcome.Warn.When == "" {
 				outcome.Warn.When = string(CephHealthWarn)
 			}
+
 			match, err := compareCephStatus(status.Health.Status, outcome.Warn.When)
 			if err != nil {
 				return nil, errors.Wrap(err, "failed to compare ceph status")
@@ -147,6 +159,7 @@ func cephStatus(analyzer *troubleshootv1beta2.CephStatusAnalyze, getCollectedFil
 			if outcome.Pass.When == "" {
 				outcome.Pass.When = string(CephHealthOK)
 			}
+
 			match, err := compareCephStatus(status.Health.Status, outcome.Pass.When)
 			if err != nil {
 				return nil, errors.Wrap(err, "failed to compare ceph status")
@@ -154,6 +167,7 @@ func cephStatus(analyzer *troubleshootv1beta2.CephStatusAnalyze, getCollectedFil
 				analyzeResult.IsPass = true
 				analyzeResult.Message = outcome.Pass.Message
 				analyzeResult.URI = outcome.Pass.URI
+
 				return analyzeResult, nil
 			}
 		}
@@ -195,21 +209,33 @@ func compareCephStatus(actual, when string) (bool, error) {
 	}
 }
 
-func detailedCephMessage(msg string, status CephStatus) string {
+func detailedCephMessage(outcomeMessage string, status CephStatus) string {
+	var msg = []string{}
+
+	if outcomeMessage != "" {
+		msg = append(msg, outcomeMessage)
+	}
+
 	if status.OsdMap.OsdMap.NumOsd > 0 {
-		msg = fmt.Sprintf("%s. %v/%v OSDs up", msg, status.OsdMap.OsdMap.NumUpOsd, status.OsdMap.OsdMap.NumOsd)
+		msg = append(msg, fmt.Sprintf("%v/%v OSDs up", status.OsdMap.OsdMap.NumUpOsd, status.OsdMap.OsdMap.NumOsd))
 	}
 
 	if status.OsdMap.OsdMap.Full {
-		msg = fmt.Sprintf("%s. OSD disk is full", msg)
+		msg = append(msg, fmt.Sprintf("OSD disk is full"))
 	} else if status.OsdMap.OsdMap.NearFull {
-		msg = fmt.Sprintf("%s. OSD disk is nearly full", msg)
+		msg = append(msg, fmt.Sprintf("OSD disk is nearly full"))
 	}
 
 	if status.PgMap.TotalBytes > 0 {
 		pgUsage := 100 * float64(status.PgMap.UsedBytes) / float64(status.PgMap.TotalBytes)
-		msg = fmt.Sprintf("%s. PG storage usage is %.1f%%.", msg, pgUsage)
+		msg = append(msg, fmt.Sprintf("PG storage usage is %.1f%%", pgUsage))
 	}
 
-	return msg
+	if status.Health.Checks != nil {
+		for k, v := range status.Health.Checks {
+			msg = append(msg, fmt.Sprintf("%s: %s", k, v.Summary.Message))
+		}
+	}
+
+	return strings.Join(msg, "\n")
 }

pkg/analyze/ceph_test.go

@@ -56,7 +56,7 @@ func Test_cephStatus(t *testing.T) {
 				IsWarn:  true,
 				IsFail:  false,
 				Title:   "Ceph Status",
-				Message: "Ceph status is HEALTH_WARN. 5/5 OSDs up. OSD disk is nearly full. PG storage usage is 85.0%.",
+				Message: "Ceph status is HEALTH_WARN\n5/5 OSDs up\nOSD disk is nearly full\nPG storage usage is 85.0%",
 				URI:     "https://rook.io/docs/rook/v1.4/ceph-common-issues.html",
 				IconKey: "rook",
 				IconURI: "https://troubleshoot.sh/images/analyzer-icons/rook.svg?w=11&h=16",
@@ -89,7 +89,7 @@ func Test_cephStatus(t *testing.T) {
 				IsWarn:  false,
 				IsFail:  true,
 				Title:   "Ceph Status",
-				Message: "Ceph status is HEALTH_ERR. 4/5 OSDs up. OSD disk is full. PG storage usage is 95.0%.",
+				Message: "Ceph status is HEALTH_ERR\n4/5 OSDs up\nOSD disk is full\nPG storage usage is 95.0%",
 				URI:     "https://rook.io/docs/rook/v1.4/ceph-common-issues.html",
 				IconKey: "rook",
 				IconURI: "https://troubleshoot.sh/images/analyzer-icons/rook.svg?w=11&h=16",
@@ -172,7 +172,7 @@ func Test_cephStatus(t *testing.T) {
 				IsWarn:  false,
 				IsFail:  true,
 				Title:   "Ceph Status",
-				Message: "custom message WARN. 5/5 OSDs up. OSD disk is nearly full. PG storage usage is 85.0%.",
+				Message: "custom message WARN\n5/5 OSDs up\nOSD disk is nearly full\nPG storage usage is 85.0%",
 				URI:     "custom uri WARN",
 				IconKey: "rook",
 				IconURI: "https://troubleshoot.sh/images/analyzer-icons/rook.svg?w=11&h=16",
@@ -218,6 +218,43 @@ func Test_cephStatus(t *testing.T) {
 				}
 			}`,
 		},
+		{
+			name:     "warn case with multiple health status messages",
+			analyzer: troubleshootv1beta2.CephStatusAnalyze{},
+			expectResult: AnalyzeResult{
+				IsPass:  false,
+				IsWarn:  true,
+				IsFail:  false,
+				Title:   "Ceph Status",
+				Message: "Ceph status is HEALTH_WARN\nPOOL_NO_REDUNDANCY: 11 pool(s) have no replicas configured\nPOOL_PG_NUM_NOT_POWER_OF_TWO: 8 pool(s) have non-power-of-two pg_num",
+				URI:     "https://rook.io/docs/rook/v1.4/ceph-common-issues.html",
+				IconKey: "rook",
+				IconURI: "https://troubleshoot.sh/images/analyzer-icons/rook.svg?w=11&h=16",
+			},
+			filePath: "ceph/status.json",
+			file: `{
+				"fsid": "96a8178c-6aa2-4adf-a309-9e8869a79611",
+				"health": {
+					"status": "HEALTH_WARN",
+					"checks": {
+						"POOL_NO_REDUNDANCY": {
+							"severity": "HEALTH_WARN",
+							"summary": {
+								"message": "11 pool(s) have no replicas configured",
+								"count": 11
+							},
+							"muted": false
+						},
+						"POOL_PG_NUM_NOT_POWER_OF_TWO": {
+							"severity": "HEALTH_WARN",
+							"summary": {
+								"message": "8 pool(s) have non-power-of-two pg_num"
+							}
+						}
+					}
+				}
+			}`,
+		},
 	}
 
 	for _, test := range tests {

pkg/analyze/cluster_pod_statuses.go

@@ -22,7 +22,7 @@ func clusterPodStatuses(analyzer *troubleshootv1beta2.ClusterPodStatuses, getChi
 
 	var pods []corev1.Pod
 	for fileName, fileContent := range collected {
-		podsNs := strings.TrimSuffix(fileName, ".json")
+		podsNs := strings.TrimSuffix(filepath.Base(fileName), ".json")
 		include := len(analyzer.Namespaces) == 0
 		for _, ns := range analyzer.Namespaces {
 			if ns == podsNs {
@@ -33,9 +33,14 @@ func clusterPodStatuses(analyzer *troubleshootv1beta2.ClusterPodStatuses, getChi
 		if include {
 			var nsPods corev1.PodList
 			if err := json.Unmarshal(fileContent, &nsPods); err != nil {
-				return nil, errors.Wrapf(err, "failed to unmarshal pods list for namespace %s", podsNs)
+				var nsPodsArr []corev1.Pod
+				if err := json.Unmarshal(fileContent, &nsPodsArr); err != nil {
+					return nil, errors.Wrapf(err, "failed to unmarshal pods list for namespace %s", podsNs)
+				}
+				pods = append(pods, nsPodsArr...)
+			} else {
+				pods = append(pods, nsPods.Items...)
 			}
-			pods = append(pods, nsPods.Items...)
 		}
 	}
 

pkg/analyze/host_block_devices.go

@@ -27,7 +27,7 @@ func (a *AnalyzeHostBlockDevices) IsExcluded() (bool, error) {
 func (a *AnalyzeHostBlockDevices) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	contents, err := getCollectedFileContents("system/block_devices.json")
+	contents, err := getCollectedFileContents(collect.HostBlockDevicesPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")
 	}

pkg/analyze/host_certificate.go

@@ -26,7 +26,7 @@ func (a *AnalyzeHostCertificate) Analyze(getCollectedFileContents func(string) (
 	if collectorName == "" {
 		collectorName = "certificate"
 	}
-	name := filepath.Join("certificate", collectorName+".json")
+	name := filepath.Join("host-collectors/certificate", collectorName+".json")
 	contents, err := getCollectedFileContents(name)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")

pkg/analyze/host_cpu.go

@@ -25,7 +25,7 @@ func (a *AnalyzeHostCPU) IsExcluded() (bool, error) {
 func (a *AnalyzeHostCPU) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	contents, err := getCollectedFileContents("system/cpu.json")
+	contents, err := getCollectedFileContents(collect.HostCPUPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")
 	}

pkg/analyze/host_disk_usage.go

@@ -3,6 +3,7 @@ package analyzer
 import (
 	"encoding/json"
 	"fmt"
+	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -27,15 +28,18 @@ func (a *AnalyzeHostDiskUsage) IsExcluded() (bool, error) {
 func (a *AnalyzeHostDiskUsage) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	key := collect.HostDiskUsageKey(hostAnalyzer.CollectorName)
-	contents, err := getCollectedFileContents(key)
+	name := filepath.Join("host-collectors/diskUsage", "diskUsage.json")
+	if hostAnalyzer.CollectorName != "" {
+		name = filepath.Join("host-collectors/diskUsage", hostAnalyzer.CollectorName+".json")
+	}
+	contents, err := getCollectedFileContents(name)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get collected file %s", key)
+		return nil, errors.Wrapf(err, "failed to get collected file %s", name)
 	}
 
 	diskUsageInfo := collect.DiskUsageInfo{}
 	if err := json.Unmarshal(contents, &diskUsageInfo); err != nil {
-		return nil, errors.Wrapf(err, "failed to unmarshal disk usage info from %s", key)
+		return nil, errors.Wrapf(err, "failed to unmarshal disk usage info from %s", name)
 	}
 
 	result := AnalyzeResult{

pkg/analyze/host_filesystem_performance.go

@@ -34,7 +34,7 @@ func (a *AnalyzeHostFilesystemPerformance) Analyze(getCollectedFileContents func
 	if collectorName == "" {
 		collectorName = "filesystemPerformance"
 	}
-	name := filepath.Join("filesystemPerformance", collectorName+".json")
+	name := filepath.Join("host-collectors/filesystemPerformance", collectorName+".json")
 	contents, err := getCollectedFileContents(name)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get collected file %s", name)

pkg/analyze/host_http.go

@@ -32,9 +32,9 @@ func (a *AnalyzeHostHTTP) IsExcluded() (bool, error) {
 func (a *AnalyzeHostHTTP) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	name := filepath.Join("http", "result.json")
+	name := filepath.Join("host-collectors/http", "result.json")
 	if hostAnalyzer.CollectorName != "" {
-		name = filepath.Join("http", hostAnalyzer.CollectorName+".json")
+		name = filepath.Join("host-collectors/http", hostAnalyzer.CollectorName+".json")
 	}
 	contents, err := getCollectedFileContents(name)
 	if err != nil {

pkg/analyze/host_httploadbalancer.go

@@ -29,7 +29,7 @@ func (a *AnalyzeHostHTTPLoadBalancer) Analyze(getCollectedFileContents func(stri
 	if collectorName == "" {
 		collectorName = "httpLoadBalancer"
 	}
-	fullPath := path.Join("httpLoadBalancer", fmt.Sprintf("%s.json", collectorName))
+	fullPath := path.Join("host-collectors/httpLoadBalancer", fmt.Sprintf("%s.json", collectorName))
 
 	collected, err := getCollectedFileContents(fullPath)
 	if err != nil {

pkg/analyze/host_ipv4interfaces.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
+	"github.com/replicatedhq/troubleshoot/pkg/collect"
 )
 
 type AnalyzeHostIPV4Interfaces struct {
@@ -26,7 +27,7 @@ func (a *AnalyzeHostIPV4Interfaces) IsExcluded() (bool, error) {
 func (a *AnalyzeHostIPV4Interfaces) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	contents, err := getCollectedFileContents("system/ipv4Interfaces.json")
+	contents, err := getCollectedFileContents(collect.HostIPV4InterfacesPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")
 	}

pkg/analyze/host_kernel_modules.go

@@ -43,7 +43,7 @@ func (a *AnalyzeHostKernelModules) IsExcluded() (bool, error) {
 //
 func (a *AnalyzeHostKernelModules) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
-	contents, err := getCollectedFileContents("system/kernel_modules.json")
+	contents, err := getCollectedFileContents(collect.HostKernelModulesPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")
 	}

pkg/analyze/host_memory.go

@@ -26,7 +26,7 @@ func (a *AnalyzeHostMemory) IsExcluded() (bool, error) {
 func (a *AnalyzeHostMemory) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	contents, err := getCollectedFileContents("system/memory.json")
+	contents, err := getCollectedFileContents(collect.HostMemoryPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")
 	}

pkg/analyze/host_os_info.go

@@ -29,7 +29,7 @@ func (a *AnalyzeHostOS) Analyze(getCollectedFileContents func(string) ([]byte, e
 	result := AnalyzeResult{}
 	result.Title = a.Title()
 
-	contents, err := getCollectedFileContents("system/hostos_info.json")
+	contents, err := getCollectedFileContents(collect.HostOSInfoPath)
 	if err != nil {
 		return []*AnalyzeResult{&result}, errors.Wrap(err, "failed to get collected file")
 	}

pkg/analyze/host_system_packages.go

@@ -31,9 +31,9 @@ func (a *AnalyzeHostSystemPackages) IsExcluded() (bool, error) {
 func (a *AnalyzeHostSystemPackages) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	packagesFileName := "system/packages.json"
+	packagesFileName := "host-collectors/system/packages.json"
 	if a.hostAnalyzer.CollectorName != "" {
-		packagesFileName = fmt.Sprintf("system/%s-packages.json", a.hostAnalyzer.CollectorName)
+		packagesFileName = fmt.Sprintf("host-collectors/system/%s-packages.json", a.hostAnalyzer.CollectorName)
 	}
 
 	contents, err := getCollectedFileContents(packagesFileName)

pkg/analyze/host_tcp_connect.go

@@ -2,8 +2,7 @@ package analyzer
 
 import (
 	"encoding/json"
-	"fmt"
-	"path"
+	"path/filepath"
 
 	"github.com/pkg/errors"
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
@@ -25,7 +24,11 @@ func (a *AnalyzeHostTCPConnect) IsExcluded() (bool, error) {
 func (a *AnalyzeHostTCPConnect) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	fullPath := path.Join("connect", fmt.Sprintf("%s.json", hostAnalyzer.CollectorName))
+	collectorName := hostAnalyzer.CollectorName
+	if collectorName == "" {
+		collectorName = "connect"
+	}
+	fullPath := filepath.Join("host-collectors/connect", collectorName+".json")
 
 	collected, err := getCollectedFileContents(fullPath)
 	if err != nil {

pkg/analyze/host_tcploadbalancer.go

@@ -30,7 +30,7 @@ func (a *AnalyzeHostTCPLoadBalancer) Analyze(getCollectedFileContents func(strin
 		collectorName = "tcpLoadBalancer"
 	}
 
-	fullPath := path.Join("tcpLoadBalancer", fmt.Sprintf("%s.json", collectorName))
+	fullPath := path.Join("host-collectors/tcpLoadBalancer", fmt.Sprintf("%s.json", collectorName))
 
 	collected, err := getCollectedFileContents(fullPath)
 	if err != nil {

pkg/analyze/host_tcpportstatus.go

@@ -27,9 +27,9 @@ func (a *AnalyzeHostTCPPortStatus) IsExcluded() (bool, error) {
 func (a *AnalyzeHostTCPPortStatus) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	fullPath := path.Join("tcpPortStatus", "tcpPortStatus.json")
+	fullPath := path.Join("host-collectors/tcpPortStatus", "tcpPortStatus.json")
 	if hostAnalyzer.CollectorName != "" {
-		fullPath = path.Join("tcpPortStatus", fmt.Sprintf("%s.json", hostAnalyzer.CollectorName))
+		fullPath = path.Join("host-collectors/tcpPortStatus", fmt.Sprintf("%s.json", hostAnalyzer.CollectorName))
 	}
 
 	collected, err := getCollectedFileContents(fullPath)

pkg/analyze/host_time.go

@@ -32,7 +32,7 @@ func (a *AnalyzeHostTime) IsExcluded() (bool, error) {
 func (a *AnalyzeHostTime) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	contents, err := getCollectedFileContents("system/time.json")
+	contents, err := getCollectedFileContents(collect.HostTimePath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")
 	}

pkg/apis/troubleshoot/v1beta1/analyzer_shared.go

@@ -116,8 +116,8 @@ type DatabaseAnalyze struct {
 }
 
 type AnalyzeMeta struct {
-	CheckName string                 `json:"checkName,omitempty" yaml:"checkName,omitempty"`
-	Exclude   multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
+	CheckName string                  `json:"checkName,omitempty" yaml:"checkName,omitempty"`
+	Exclude   *multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
 }
 
 type Analyze struct {

pkg/apis/troubleshoot/v1beta1/collector_shared.go

@@ -11,7 +11,7 @@ import (
 type CollectorMeta struct {
 	CollectorName string `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
 	// +optional
-	Exclude multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
+	Exclude *multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
 }
 
 type ClusterInfo struct {

pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go

@@ -22,6 +22,7 @@ limitations under the License.
 package v1beta1
 
 import (
+	"github.com/replicatedhq/troubleshoot/pkg/multitype"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -143,7 +144,11 @@ func (in *Analyze) DeepCopy() *Analyze {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AnalyzeMeta) DeepCopyInto(out *AnalyzeMeta) {
 	*out = *in
-	out.Exclude = in.Exclude
+	if in.Exclude != nil {
+		in, out := &in.Exclude, &out.Exclude
+		*out = new(multitype.BoolOrString)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AnalyzeMeta.
@@ -159,7 +164,7 @@ func (in *AnalyzeMeta) DeepCopy() *AnalyzeMeta {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AnalyzeSecret) DeepCopyInto(out *AnalyzeSecret) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -286,7 +291,7 @@ func (in *AnalyzerStatus) DeepCopy() *AnalyzerStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClusterInfo) DeepCopyInto(out *ClusterInfo) {
 	*out = *in
-	out.CollectorMeta = in.CollectorMeta
+	in.CollectorMeta.DeepCopyInto(&out.CollectorMeta)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterInfo.
@@ -302,7 +307,7 @@ func (in *ClusterInfo) DeepCopy() *ClusterInfo {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClusterResources) DeepCopyInto(out *ClusterResources) {
 	*out = *in
-	out.CollectorMeta = in.CollectorMeta
+	in.CollectorMeta.DeepCopyInto(&out.CollectorMeta)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterResources.
@@ -318,7 +323,7 @@ func (in *ClusterResources) DeepCopy() *ClusterResources {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClusterVersion) DeepCopyInto(out *ClusterVersion) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -348,17 +353,17 @@ func (in *Collect) DeepCopyInto(out *Collect) {
 	if in.ClusterInfo != nil {
 		in, out := &in.ClusterInfo, &out.ClusterInfo
 		*out = new(ClusterInfo)
-		**out = **in
+		(*in).DeepCopyInto(*out)
 	}
 	if in.ClusterResources != nil {
 		in, out := &in.ClusterResources, &out.ClusterResources
 		*out = new(ClusterResources)
-		**out = **in
+		(*in).DeepCopyInto(*out)
 	}
 	if in.Secret != nil {
 		in, out := &in.Secret, &out.Secret
 		*out = new(Secret)
-		**out = **in
+		(*in).DeepCopyInto(*out)
 	}
 	if in.Logs != nil {
 		in, out := &in.Logs, &out.Logs
@@ -378,7 +383,7 @@ func (in *Collect) DeepCopyInto(out *Collect) {
 	if in.Data != nil {
 		in, out := &in.Data, &out.Data
 		*out = new(Data)
-		**out = **in
+		(*in).DeepCopyInto(*out)
 	}
 	if in.Copy != nil {
 		in, out := &in.Copy, &out.Copy
@@ -393,17 +398,17 @@ func (in *Collect) DeepCopyInto(out *Collect) {
 	if in.Postgres != nil {
 		in, out := &in.Postgres, &out.Postgres
 		*out = new(Database)
-		**out = **in
+		(*in).DeepCopyInto(*out)
 	}
 	if in.Mysql != nil {
 		in, out := &in.Mysql, &out.Mysql
 		*out = new(Database)
-		**out = **in
+		(*in).DeepCopyInto(*out)
 	}
 	if in.Redis != nil {
 		in, out := &in.Redis, &out.Redis
 		*out = new(Database)
-		**out = **in
+		(*in).DeepCopyInto(*out)
 	}
 }
 
@@ -479,7 +484,11 @@ func (in *CollectorList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *CollectorMeta) DeepCopyInto(out *CollectorMeta) {
 	*out = *in
-	out.Exclude = in.Exclude
+	if in.Exclude != nil {
+		in, out := &in.Exclude, &out.Exclude
+		*out = new(multitype.BoolOrString)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CollectorMeta.
@@ -547,7 +556,7 @@ func (in *CollectorStatus) DeepCopy() *CollectorStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ContainerRuntime) DeepCopyInto(out *ContainerRuntime) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -574,7 +583,7 @@ func (in *ContainerRuntime) DeepCopy() *ContainerRuntime {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Copy) DeepCopyInto(out *Copy) {
 	*out = *in
-	out.CollectorMeta = in.CollectorMeta
+	in.CollectorMeta.DeepCopyInto(&out.CollectorMeta)
 	if in.Selector != nil {
 		in, out := &in.Selector, &out.Selector
 		*out = make([]string, len(*in))
@@ -595,7 +604,7 @@ func (in *Copy) DeepCopy() *Copy {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *CustomResourceDefinition) DeepCopyInto(out *CustomResourceDefinition) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -622,7 +631,7 @@ func (in *CustomResourceDefinition) DeepCopy() *CustomResourceDefinition {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Data) DeepCopyInto(out *Data) {
 	*out = *in
-	out.CollectorMeta = in.CollectorMeta
+	in.CollectorMeta.DeepCopyInto(&out.CollectorMeta)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Data.
@@ -638,7 +647,7 @@ func (in *Data) DeepCopy() *Data {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Database) DeepCopyInto(out *Database) {
 	*out = *in
-	out.CollectorMeta = in.CollectorMeta
+	in.CollectorMeta.DeepCopyInto(&out.CollectorMeta)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Database.
@@ -654,7 +663,7 @@ func (in *Database) DeepCopy() *Database {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DatabaseAnalyze) DeepCopyInto(out *DatabaseAnalyze) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -681,7 +690,7 @@ func (in *DatabaseAnalyze) DeepCopy() *DatabaseAnalyze {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DeploymentStatus) DeepCopyInto(out *DeploymentStatus) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -708,7 +717,7 @@ func (in *DeploymentStatus) DeepCopy() *DeploymentStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Distribution) DeepCopyInto(out *Distribution) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -735,7 +744,7 @@ func (in *Distribution) DeepCopy() *Distribution {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Exec) DeepCopyInto(out *Exec) {
 	*out = *in
-	out.CollectorMeta = in.CollectorMeta
+	in.CollectorMeta.DeepCopyInto(&out.CollectorMeta)
 	if in.Selector != nil {
 		in, out := &in.Selector, &out.Selector
 		*out = make([]string, len(*in))
@@ -808,7 +817,7 @@ func (in *Get) DeepCopy() *Get {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *HTTP) DeepCopyInto(out *HTTP) {
 	*out = *in
-	out.CollectorMeta = in.CollectorMeta
+	in.CollectorMeta.DeepCopyInto(&out.CollectorMeta)
 	if in.Get != nil {
 		in, out := &in.Get, &out.Get
 		*out = new(Get)
@@ -839,7 +848,7 @@ func (in *HTTP) DeepCopy() *HTTP {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ImagePullSecret) DeepCopyInto(out *ImagePullSecret) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -888,7 +897,7 @@ func (in *ImagePullSecrets) DeepCopy() *ImagePullSecrets {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Ingress) DeepCopyInto(out *Ingress) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -930,7 +939,7 @@ func (in *LogLimits) DeepCopy() *LogLimits {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Logs) DeepCopyInto(out *Logs) {
 	*out = *in
-	out.CollectorMeta = in.CollectorMeta
+	in.CollectorMeta.DeepCopyInto(&out.CollectorMeta)
 	if in.Selector != nil {
 		in, out := &in.Selector, &out.Selector
 		*out = make([]string, len(*in))
@@ -1003,7 +1012,7 @@ func (in *NodeResourceSelectors) DeepCopy() *NodeResourceSelectors {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *NodeResources) DeepCopyInto(out *NodeResources) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -1397,7 +1406,7 @@ func (in *ResultRequest) DeepCopy() *ResultRequest {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Run) DeepCopyInto(out *Run) {
 	*out = *in
-	out.CollectorMeta = in.CollectorMeta
+	in.CollectorMeta.DeepCopyInto(&out.CollectorMeta)
 	if in.Command != nil {
 		in, out := &in.Command, &out.Command
 		*out = make([]string, len(*in))
@@ -1428,7 +1437,7 @@ func (in *Run) DeepCopy() *Run {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Secret) DeepCopyInto(out *Secret) {
 	*out = *in
-	out.CollectorMeta = in.CollectorMeta
+	in.CollectorMeta.DeepCopyInto(&out.CollectorMeta)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Secret.
@@ -1459,7 +1468,7 @@ func (in *SingleOutcome) DeepCopy() *SingleOutcome {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *StatefulsetStatus) DeepCopyInto(out *StatefulsetStatus) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -1486,7 +1495,7 @@ func (in *StatefulsetStatus) DeepCopy() *StatefulsetStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *StorageClass) DeepCopyInto(out *StorageClass) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))
@@ -1666,7 +1675,7 @@ func (in *SupportBundleVersionSpec) DeepCopy() *SupportBundleVersionSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TextAnalyze) DeepCopyInto(out *TextAnalyze) {
 	*out = *in
-	out.AnalyzeMeta = in.AnalyzeMeta
+	in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta)
 	if in.Outcomes != nil {
 		in, out := &in.Outcomes, &out.Outcomes
 		*out = make([]*Outcome, len(*in))

pkg/apis/troubleshoot/v1beta2/analyzer_shared.go

@@ -175,8 +175,9 @@ type SysctlAnalyze struct {
 }
 
 type AnalyzeMeta struct {
-	CheckName string                 `json:"checkName,omitempty" yaml:"checkName,omitempty"`
-	Exclude   multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
+	CheckName string                  `json:"checkName,omitempty" yaml:"checkName,omitempty"`
+	Exclude   *multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
+	Strict    *multitype.BoolOrString `json:"strict,omitempty" yaml:"strict,omitempty"`
 }
 
 type Analyze struct {

pkg/apis/troubleshoot/v1beta2/collector_shared.go

@@ -6,13 +6,14 @@ import (
 
 	"github.com/replicatedhq/troubleshoot/pkg/multitype"
 	authorizationv1 "k8s.io/api/authorization/v1"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type CollectorMeta struct {
 	CollectorName string `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
 	// +optional
-	Exclude multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
+	Exclude *multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
 }
 
 type ClusterInfo struct {
@@ -65,15 +66,25 @@ type Data struct {
 }
 
 type Run struct {
+	CollectorMeta      `json:",inline" yaml:",inline"`
+	Name               string            `json:"name,omitempty" yaml:"name,omitempty"`
+	Namespace          string            `json:"namespace" yaml:"namespace"`
+	Image              string            `json:"image" yaml:"image"`
+	Command            []string          `json:"command,omitempty" yaml:"command,omitempty"`
+	Args               []string          `json:"args,omitempty" yaml:"args,omitempty"`
+	Timeout            string            `json:"timeout,omitempty" yaml:"timeout,omitempty"`
+	ImagePullPolicy    string            `json:"imagePullPolicy,omitempty" yaml:"imagePullPolicy,omitempty"`
+	ImagePullSecret    *ImagePullSecrets `json:"imagePullSecret,omitempty" yaml:"imagePullSecret,omitempty"`
+	ServiceAccountName string            `json:"serviceAccountName,omitempty" yaml:"serviceAccountName,omitempty"`
+}
+
+type RunPod struct {
 	CollectorMeta   `json:",inline" yaml:",inline"`
 	Name            string            `json:"name,omitempty" yaml:"name,omitempty"`
 	Namespace       string            `json:"namespace" yaml:"namespace"`
-	Image           string            `json:"image" yaml:"image"`
-	Command         []string          `json:"command,omitempty" yaml:"command,omitempty"`
-	Args            []string          `json:"args,omitempty" yaml:"args,omitempty"`
 	Timeout         string            `json:"timeout,omitempty" yaml:"timeout,omitempty"`
-	ImagePullPolicy string            `json:"imagePullPolicy,omitempty" yaml:"imagePullPolicy,omitempty"`
 	ImagePullSecret *ImagePullSecrets `json:"imagePullSecret,omitempty" yaml:"imagePullSecret,omitempty"`
+	PodSpec         corev1.PodSpec    `json:"podSpec,omitempty" yaml:"podSpec,omitempty"`
 }
 
 type ImagePullSecrets struct {
@@ -155,7 +166,8 @@ type Put struct {
 
 type Database struct {
 	CollectorMeta `json:",inline" yaml:",inline"`
-	URI           string `json:"uri" yaml:"uri"`
+	URI           string   `json:"uri" yaml:"uri"`
+	Parameters    []string `json:"parameters,omitempty"`
 }
 
 type Collectd struct {
@@ -194,6 +206,7 @@ type Collect struct {
 	ConfigMap        *ConfigMap        `json:"configMap,omitempty" yaml:"configMap,omitempty"`
 	Logs             *Logs             `json:"logs,omitempty" yaml:"logs,omitempty"`
 	Run              *Run              `json:"run,omitempty" yaml:"run,omitempty"`
+	RunPod           *RunPod           `json:"runPod,omitempty" yaml:"runPod,omitempty"`
 	Exec             *Exec             `json:"exec,omitempty" yaml:"exec,omitempty"`
 	Data             *Data             `json:"data,omitempty" yaml:"data,omitempty"`
 	Copy             *Copy             `json:"copy,omitempty" yaml:"copy,omitempty"`
@@ -327,6 +340,19 @@ func (c *Collect) AccessReviewSpecs(overrideNS string) []authorizationv1.SelfSub
 			},
 			NonResourceAttributes: nil,
 		})
+	} else if c.RunPod != nil {
+		result = append(result, authorizationv1.SelfSubjectAccessReviewSpec{
+			ResourceAttributes: &authorizationv1.ResourceAttributes{
+				Namespace:   pickNamespaceOrDefault(c.RunPod.Namespace, overrideNS),
+				Verb:        "create",
+				Group:       "",
+				Version:     "",
+				Resource:    "pods",
+				Subresource: "",
+				Name:        "",
+			},
+			NonResourceAttributes: nil,
+		})
 	} else if c.Exec != nil {
 		result = append(result, authorizationv1.SelfSubjectAccessReviewSpec{
 			ResourceAttributes: &authorizationv1.ResourceAttributes{
@@ -432,6 +458,10 @@ func (c *Collect) GetName() string {
 		collector = "run"
 		name = c.Run.CollectorName
 	}
+	if c.RunPod != nil {
+		collector = "run-pod"
+		name = c.RunPod.CollectorName
+	}
 	if c.Exec != nil {
 		collector = "exec"
 		name = c.Exec.CollectorName
@@ -454,6 +484,18 @@ func (c *Collect) GetName() string {
 		collector = "http"
 		name = c.HTTP.CollectorName
 	}
+	if c.Postgres != nil {
+		collector = "postgres"
+		name = c.Postgres.CollectorName
+	}
+	if c.Mysql != nil {
+		collector = "mysql"
+		name = c.Mysql.CollectorName
+	}
+	if c.Redis != nil {
+		collector = "redis"
+		name = c.Redis.CollectorName
+	}
 	if c.Collectd != nil {
 		collector = "collectd"
 		name = c.Collectd.CollectorName

pkg/apis/troubleshoot/v1beta2/hostanalyzer_shared.go

@@ -1,13 +1,15 @@
 package v1beta2
 
 type CPUAnalyze struct {
-	AnalyzeMeta `json:",inline" yaml:",inline"`
-	Outcomes    []*Outcome `json:"outcomes" yaml:"outcomes"`
+	AnalyzeMeta   `json:",inline" yaml:",inline"`
+	CollectorName string     `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
+	Outcomes      []*Outcome `json:"outcomes" yaml:"outcomes"`
 }
 
 type MemoryAnalyze struct {
-	AnalyzeMeta `json:",inline" yaml:",inline"`
-	Outcomes    []*Outcome `json:"outcomes" yaml:"outcomes"`
+	AnalyzeMeta   `json:",inline" yaml:",inline"`
+	CollectorName string     `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
+	Outcomes      []*Outcome `json:"outcomes" yaml:"outcomes"`
 }
 
 type TCPLoadBalancerAnalyze struct {
@@ -41,12 +43,14 @@ type HTTPAnalyze struct {
 }
 
 type TimeAnalyze struct {
-	AnalyzeMeta `json:",inline" yaml:",inline"`
-	Outcomes    []*Outcome `json:"outcomes" yaml:"outcomes"`
+	AnalyzeMeta   `json:",inline" yaml:",inline"`
+	CollectorName string     `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
+	Outcomes      []*Outcome `json:"outcomes" yaml:"outcomes"`
 }
 
 type BlockDevicesAnalyze struct {
 	AnalyzeMeta                `json:",inline" yaml:",inline"`
+	CollectorName              string     `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
 	MinimumAcceptableSize      uint64     `json:"minimumAcceptableSize" yaml:"minimumAcceptableSize"`
 	IncludeUnmountedPartitions bool       `json:"includeUnmountedPartitions" yaml:"includeUnmountedPartitions"`
 	Outcomes                   []*Outcome `json:"outcomes" yaml:"outcomes"`
@@ -59,8 +63,9 @@ type SystemPackagesAnalyze struct {
 }
 
 type KernelModulesAnalyze struct {
-	AnalyzeMeta `json:",inline" yaml:",inline"`
-	Outcomes    []*Outcome `json:"outcomes" yaml:"outcomes"`
+	AnalyzeMeta   `json:",inline" yaml:",inline"`
+	CollectorName string     `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
+	Outcomes      []*Outcome `json:"outcomes" yaml:"outcomes"`
 }
 
 type TCPConnectAnalyze struct {
@@ -70,8 +75,9 @@ type TCPConnectAnalyze struct {
 }
 
 type IPV4InterfacesAnalyze struct {
-	AnalyzeMeta `json:",inline" yaml:",inline"`
-	Outcomes    []*Outcome `json:"outcomes" yaml:"outcomes"`
+	AnalyzeMeta   `json:",inline" yaml:",inline"`
+	CollectorName string     `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
+	Outcomes      []*Outcome `json:"outcomes" yaml:"outcomes"`
 }
 
 type FilesystemPerformanceAnalyze struct {
@@ -87,12 +93,15 @@ type CertificateAnalyze struct {
 }
 
 type HostServicesAnalyze struct {
-	AnalyzeMeta `json:",inline" yaml:",inline"`
-	Outcomes    []*Outcome `json:"outcomes" yaml:"outcomes"`
+	AnalyzeMeta   `json:",inline" yaml:",inline"`
+	CollectorName string     `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
+	Outcomes      []*Outcome `json:"outcomes" yaml:"outcomes"`
 }
+
 type HostOSAnalyze struct {
-	AnalyzeMeta `json:",inline" yaml:",inline"`
-	Outcomes    []*Outcome `json:"outcomes" yaml:"outcomes"`
+	AnalyzeMeta   `json:",inline" yaml:",inline"`
+	CollectorName string     `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
+	Outcomes      []*Outcome `json:"outcomes" yaml:"outcomes"`
 }
 type HostAnalyze struct {
 	CPU *CPUAnalyze `json:"cpu,omitempty" yaml:"cpu,omitempty"`

pkg/apis/troubleshoot/v1beta2/hostcollector_shared.go

@@ -7,7 +7,7 @@ import (
 type HostCollectorMeta struct {
 	CollectorName string `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
 	// +optional
-	Exclude multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
+	Exclude *multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
 }
 
 type CPU struct {

pkg/apis/troubleshoot/v1beta2/remote_collector_shared.go

@@ -10,7 +10,7 @@ import (
 type RemoteCollectorMeta struct {
 	CollectorName string `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
 	// +optional
-	Exclude multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
+	Exclude *multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
 }
 
 type RemoteCPU struct {

pkg/apis/troubleshoot/v1beta2/supportbundle_types.go

@@ -24,6 +24,7 @@ import (
 type SupportBundleSpec struct {
 	AfterCollection []*AfterCollection `json:"afterCollection,omitempty" yaml:"afterCollection,omitempty"`
 	Collectors      []*Collect         `json:"collectors,omitempty" yaml:"collectors,omitempty"`
+	HostCollectors  []*HostCollect     `json:"hostCollectors,omitempty" yaml:"hostCollectors,omitempty"`
 	Analyzers       []*Analyze         `json:"analyzers,omitempty" yaml:"analyzers,omitempty"`
 }
 

pkg/collect/ceph.go

@@ -3,7 +3,6 @@ package collect
 import (
 	"context"
 	"fmt"
-	"io"
 	"os"
 	"path"
 	"strings"
@@ -28,52 +27,60 @@ type CephCommand struct {
 
 var CephCommands = []CephCommand{
 	{
-		ID:      "status",
-		Command: []string{"ceph", "status"},
-		Args:    []string{"-f", "json-pretty"},
-		Format:  "json",
+		ID:             "status",
+		Command:        []string{"ceph", "status"},
+		Args:           []string{"-f", "json-pretty"},
+		Format:         "json",
+		DefaultTimeout: "30s",
 	},
 	{
-		ID:      "fs",
-		Command: []string{"ceph", "fs", "status"},
-		Args:    []string{"-f", "json-pretty"},
-		Format:  "json",
+		ID:             "fs",
+		Command:        []string{"ceph", "fs", "status"},
+		Args:           []string{"-f", "json-pretty"},
+		Format:         "json",
+		DefaultTimeout: "30s",
 	},
 	{
-		ID:      "fs-ls",
-		Command: []string{"ceph", "fs", "ls"},
-		Args:    []string{"-f", "json-pretty"},
-		Format:  "json",
+		ID:             "fs-ls",
+		Command:        []string{"ceph", "fs", "ls"},
+		Args:           []string{"-f", "json-pretty"},
+		Format:         "json",
+		DefaultTimeout: "30s",
 	},
 	{
-		ID:      "osd-status",
-		Command: []string{"ceph", "osd", "status"},
-		Args:    []string{"-f", "json-pretty"},
-		Format:  "txt",
+		ID:             "osd-status",
+		Command:        []string{"ceph", "osd", "status"},
+		Args:           []string{"-f", "json-pretty"},
+		Format:         "txt",
+		DefaultTimeout: "30s",
 	},
 	{
-		ID:      "osd-tree",
-		Command: []string{"ceph", "osd", "tree"},
-		Args:    []string{"-f", "json-pretty"},
-		Format:  "json",
+		ID:             "osd-tree",
+		Command:        []string{"ceph", "osd", "tree"},
+		Args:           []string{"-f", "json-pretty"},
+		Format:         "json",
+		DefaultTimeout: "30s",
 	},
 	{
-		ID:      "osd-pool",
-		Command: []string{"ceph", "osd", "pool", "ls", "detail"},
-		Args:    []string{"-f", "json-pretty"},
-		Format:  "json",
+		ID:             "osd-pool",
+		Command:        []string{"ceph", "osd", "pool", "ls", "detail"},
+		Args:           []string{"-f", "json-pretty"},
+		Format:         "json",
+		DefaultTimeout: "30s",
 	},
 	{
-		ID:      "health",
-		Command: []string{"ceph", "health", "detail"},
-		Args:    []string{"-f", "json-pretty"},
-		Format:  "json",
+		ID:             "health",
+		Command:        []string{"ceph", "health", "detail"},
+		Args:           []string{"-f", "json-pretty"},
+		Format:         "json",
+		DefaultTimeout: "30s",
 	},
 	{
-		ID:      "auth",
-		Command: []string{"ceph", "auth", "ls"},
-		Args:    []string{"-f", "json-pretty"},
-		Format:  "json",
+		ID:             "auth",
+		Command:        []string{"ceph", "auth", "ls"},
+		Args:           []string{"-f", "json-pretty"},
+		Format:         "json",
+		DefaultTimeout: "30s",
 	},
 	{
 		ID:             "rgw-stats", // the disk usage (and other stats) of each object store bucket
@@ -83,10 +90,18 @@ var CephCommands = []CephCommand{
 		DefaultTimeout: "30s", // include a default timeout because this command will hang if the RGW daemon isn't running/is unhealthy
 	},
 	{
-		ID:      "rbd-du", // the disk usage of each PVC
-		Command: []string{"rbd", "du"},
-		Args:    []string{"--pool=replicapool"},
-		Format:  "txt",
+		ID:             "rbd-du", // the disk usage of each PVC
+		Command:        []string{"rbd", "du"},
+		Args:           []string{"--pool=replicapool"},
+		Format:         "txt",
+		DefaultTimeout: "30s",
+	},
+	{
+		ID:             "osd-df",
+		Command:        []string{"ceph", "osd", "df"},
+		Args:           []string{"-f", "json-pretty"},
+		Format:         "json",
+		DefaultTimeout: "30s",
 	},
 }
 
@@ -133,8 +148,8 @@ func cephCommandExec(ctx context.Context, c *Collector, cephCollector *troublesh
 		return errors.Wrap(err, "failed to exec command")
 	}
 
+	pathPrefix := GetCephCollectorFilepath(cephCollector.CollectorName, cephCollector.Namespace)
 	for srcFilename, _ := range results {
-		pathPrefix := GetCephCollectorFilepath(cephCollector.CollectorName, cephCollector.Namespace)
 		var dstFileName string
 		switch {
 		case strings.HasSuffix(srcFilename, "-stdout.txt"):
@@ -203,10 +218,7 @@ func copyResult(srcResult CollectorResult, dstResult CollectorResult, bundlePath
 		}
 		return errors.Wrap(err, "failed to get reader")
 	}
-
-	if reader, ok := reader.(io.ReadCloser); ok {
-		defer reader.Close()
-	}
+	defer reader.Close()
 
 	err = dstResult.SaveResult(bundlePath, dstKey, reader)
 	if err != nil {

pkg/collect/collect.go

@@ -56,7 +56,7 @@ func CollectHost(c *troubleshootv1beta2.HostCollector, additionalRedactors *trou
 
 	var collectors []HostCollector
 	for _, desiredCollector := range c.Spec.Collectors {
-		collector, ok := GetHostCollector(desiredCollector)
+		collector, ok := GetHostCollector(desiredCollector, "")
 		if !ok {
 			return nil, ErrHostCollectorNotFound
 		}

pkg/collect/collector.go

@@ -26,7 +26,11 @@ type Collector struct {
 
 type Collectors []*Collector
 
-func isExcluded(excludeVal multitype.BoolOrString) (bool, error) {
+func isExcluded(excludeVal *multitype.BoolOrString) (bool, error) {
+	if excludeVal == nil {
+		return false, nil
+	}
+
 	if excludeVal.Type == multitype.Bool {
 		return excludeVal.BoolVal, nil
 	}
@@ -93,6 +97,14 @@ func (c *Collector) IsExcluded() bool {
 		if isExcludedResult {
 			return true
 		}
+	} else if c.Collect.RunPod != nil {
+		isExcludedResult, err := isExcluded(c.Collect.RunPod.Exclude)
+		if err != nil {
+			return true
+		}
+		if isExcludedResult {
+			return true
+		}
 	} else if c.Collect.Exec != nil {
 		isExcludedResult, err := isExcluded(c.Collect.Exec.Exclude)
 		if err != nil {
@@ -221,6 +233,8 @@ func (c *Collector) RunCollectorSync(clientConfig *rest.Config, client kubernete
 		result, err = Logs(c, c.Collect.Logs)
 	} else if c.Collect.Run != nil {
 		result, err = Run(c, c.Collect.Run)
+	} else if c.Collect.RunPod != nil {
+		result, err = RunPod(c, c.Collect.RunPod)
 	} else if c.Collect.Exec != nil {
 		result, err = Exec(c, c.Collect.Exec)
 	} else if c.Collect.Data != nil {

pkg/collect/collector_test.go

@@ -21,7 +21,6 @@ func TestCollector_RunCollectorSyncNoRedact(t *testing.T) {
 				Data: &troubleshootv1beta2.Data{
 					CollectorMeta: troubleshootv1beta2.CollectorMeta{
 						CollectorName: "datacollectorname",
-						Exclude:       multitype.BoolOrString{},
 					},
 					Name: "data",
 					Data: `abc 123
@@ -54,7 +53,6 @@ pwd=***HIDDEN***;
 				Data: &troubleshootv1beta2.Data{
 					CollectorMeta: troubleshootv1beta2.CollectorMeta{
 						CollectorName: "datacollectorname",
-						Exclude:       multitype.BoolOrString{},
 					},
 					Name: "data",
 					Data: `abc 123
@@ -89,7 +87,6 @@ pwd=***HIDDEN***;
 				Data: &troubleshootv1beta2.Data{
 					CollectorMeta: troubleshootv1beta2.CollectorMeta{
 						CollectorName: "datacollectorname",
-						Exclude:       multitype.BoolOrString{},
 					},
 					Name: "data",
 					Data: `abc 123
@@ -124,7 +121,6 @@ pwd=***HIDDEN***;
 				Data: &troubleshootv1beta2.Data{
 					CollectorMeta: troubleshootv1beta2.CollectorMeta{
 						CollectorName: "datacollectorname",
-						Exclude:       multitype.BoolOrString{},
 					},
 					Name: "data",
 					Data: `abc 123
@@ -162,7 +158,6 @@ pwd=***HIDDEN***;
 				Data: &troubleshootv1beta2.Data{
 					CollectorMeta: troubleshootv1beta2.CollectorMeta{
 						CollectorName: "data/collectorname",
-						Exclude:       multitype.BoolOrString{},
 					},
 					Name: "data",
 					Data: `abc 123
@@ -200,7 +195,6 @@ pwd=***HIDDEN***;
 				Data: &troubleshootv1beta2.Data{
 					CollectorMeta: troubleshootv1beta2.CollectorMeta{
 						CollectorName: "datacollectorname",
-						Exclude:       multitype.BoolOrString{},
 					},
 					Name: "data",
 					Data: `abc 123
@@ -228,7 +222,6 @@ another line here
 				Data: &troubleshootv1beta2.Data{
 					CollectorMeta: troubleshootv1beta2.CollectorMeta{
 						CollectorName: "datacollectorname",
-						Exclude:       multitype.BoolOrString{},
 					},
 					Name: "data",
 					Data: `xyz123
@@ -265,7 +258,7 @@ abc
 				Data: &troubleshootv1beta2.Data{
 					CollectorMeta: troubleshootv1beta2.CollectorMeta{
 						CollectorName: "datacollectorname",
-						Exclude:       multitype.BoolOrString{Type: multitype.String, StrVal: "true"},
+						Exclude:       multitype.FromString("true"),
 					},
 					Name: "data",
 					Data: `abc 123
@@ -310,7 +303,6 @@ func TestCollector_RunCollectorSync(t *testing.T) {
 				Data: &troubleshootv1beta2.Data{
 					CollectorMeta: troubleshootv1beta2.CollectorMeta{
 						CollectorName: "datacollectorname",
-						Exclude:       multitype.BoolOrString{},
 					},
 					Name: "data",
 					Data: `abc 123

pkg/collect/database_shared.go

@@ -1,7 +1,8 @@
 package collect
 
 type DatabaseConnection struct {
-	IsConnected bool   `json:"isConnected"`
-	Error       string `json:"error,omitempty"`
-	Version     string `json:"version,omitempty"`
+	IsConnected bool              `json:"isConnected"`
+	Error       string            `json:"error,omitempty"`
+	Version     string            `json:"version,omitempty"`
+	Variables   map[string]string `json:"variables,omitempty"`
 }

pkg/collect/host_block_device.go

@@ -28,9 +28,11 @@ type BlockDeviceInfo struct {
 
 const lsblkColumns = "NAME,KNAME,PKNAME,TYPE,MAJ:MIN,SIZE,FSTYPE,MOUNTPOINT,SERIAL,RO,RM"
 const lsblkFormat = `NAME=%q KNAME=%q PKNAME=%q TYPE=%q MAJ:MIN="%d:%d" SIZE="%d" FSTYPE=%q MOUNTPOINT=%q SERIAL=%q RO="%d" RM="%d0"`
+const HostBlockDevicesPath = `host-collectors/system/block_devices.json`
 
 type CollectHostBlockDevices struct {
 	hostCollector *troubleshootv1beta2.HostBlockDevices
+	BundlePath    string
 }
 
 func (c *CollectHostBlockDevices) Title() string {
@@ -83,7 +85,10 @@ func (c *CollectHostBlockDevices) Collect(progressChan chan<- interface{}) (map[
 		return nil, errors.Wrap(err, "failed to marshal block device info")
 	}
 
+	output := NewResult()
+	output.SaveResult(c.BundlePath, HostBlockDevicesPath, bytes.NewBuffer(b))
+
 	return map[string][]byte{
-		"system/block_devices.json": b,
+		HostBlockDevicesPath: b,
 	}, nil
 }

pkg/collect/host_certificate.go

@@ -19,6 +19,7 @@ const KeyPairValid = "key-pair-valid"
 
 type CollectHostCertificate struct {
 	hostCollector *troubleshootv1beta2.Certificate
+	BundlePath    string
 }
 
 func (c *CollectHostCertificate) Title() string {
@@ -53,14 +54,19 @@ func (c *CollectHostCertificate) Collect(progressChan chan<- interface{}) (map[s
 		}
 	}
 
+	b := []byte(result)
+
 	collectorName := c.hostCollector.CollectorName
 	if collectorName == "" {
 		collectorName = "certificate"
 	}
-	name := filepath.Join("certificate", collectorName+".json")
+	name := filepath.Join("host-collectors/certificate", collectorName+".json")
+
+	output := NewResult()
+	output.SaveResult(c.BundlePath, name, bytes.NewBuffer(b))
 
 	return map[string][]byte{
-		name: []byte(result),
+		name: b,
 	}, nil
 }
 

pkg/collect/host_collector.go

@@ -10,46 +10,47 @@ type HostCollector interface {
 	Collect(progressChan chan<- interface{}) (map[string][]byte, error)
 }
 
-func GetHostCollector(collector *troubleshootv1beta2.HostCollect) (HostCollector, bool) {
+func GetHostCollector(collector *troubleshootv1beta2.HostCollect, bundlePath string) (HostCollector, bool) {
 	switch {
 	case collector.CPU != nil:
-		return &CollectHostCPU{collector.CPU}, true
+		return &CollectHostCPU{collector.CPU, bundlePath}, true
 	case collector.Memory != nil:
-		return &CollectHostMemory{collector.Memory}, true
+		return &CollectHostMemory{collector.Memory, bundlePath}, true
 	case collector.TCPLoadBalancer != nil:
-		return &CollectHostTCPLoadBalancer{collector.TCPLoadBalancer}, true
+		return &CollectHostTCPLoadBalancer{collector.TCPLoadBalancer, bundlePath}, true
 	case collector.HTTPLoadBalancer != nil:
-		return &CollectHostHTTPLoadBalancer{collector.HTTPLoadBalancer}, true
+		return &CollectHostHTTPLoadBalancer{collector.HTTPLoadBalancer, bundlePath}, true
 	case collector.DiskUsage != nil:
-		return &CollectHostDiskUsage{collector.DiskUsage}, true
+		return &CollectHostDiskUsage{collector.DiskUsage, bundlePath}, true
 	case collector.TCPPortStatus != nil:
-		return &CollectHostTCPPortStatus{collector.TCPPortStatus}, true
+		return &CollectHostTCPPortStatus{collector.TCPPortStatus, bundlePath}, true
 	case collector.HTTP != nil:
-		return &CollectHostHTTP{collector.HTTP}, true
+		return &CollectHostHTTP{collector.HTTP, bundlePath}, true
 	case collector.Time != nil:
-		return &CollectHostTime{collector.Time}, true
+		return &CollectHostTime{collector.Time, bundlePath}, true
 	case collector.BlockDevices != nil:
-		return &CollectHostBlockDevices{collector.BlockDevices}, true
+		return &CollectHostBlockDevices{collector.BlockDevices, bundlePath}, true
 	case collector.SystemPackages != nil:
-		return &CollectHostSystemPackages{collector.SystemPackages}, true
+		return &CollectHostSystemPackages{collector.SystemPackages, bundlePath}, true
 	case collector.KernelModules != nil:
 		return &CollectHostKernelModules{
 			hostCollector: collector.KernelModules,
+			BundlePath:    bundlePath,
 			loadable:      kernelModulesLoadable{},
 			loaded:        kernelModulesLoaded{},
 		}, true
 	case collector.TCPConnect != nil:
-		return &CollectHostTCPConnect{collector.TCPConnect}, true
+		return &CollectHostTCPConnect{collector.TCPConnect, bundlePath}, true
 	case collector.IPV4Interfaces != nil:
-		return &CollectHostIPV4Interfaces{collector.IPV4Interfaces}, true
+		return &CollectHostIPV4Interfaces{collector.IPV4Interfaces, bundlePath}, true
 	case collector.FilesystemPerformance != nil:
-		return &CollectHostFilesystemPerformance{collector.FilesystemPerformance}, true
+		return &CollectHostFilesystemPerformance{collector.FilesystemPerformance, bundlePath}, true
 	case collector.Certificate != nil:
-		return &CollectHostCertificate{collector.Certificate}, true
+		return &CollectHostCertificate{collector.Certificate, bundlePath}, true
 	case collector.HostServices != nil:
-		return &CollectHostServices{collector.HostServices}, true
+		return &CollectHostServices{collector.HostServices, bundlePath}, true
 	case collector.HostOS != nil:
-		return &CollectHostOS{collector.HostOS}, true
+		return &CollectHostOS{collector.HostOS, bundlePath}, true
 	default:
 		return nil, false
 	}

pkg/collect/host_cpu.go

@@ -1,6 +1,7 @@
 package collect
 
 import (
+	"bytes"
 	"encoding/json"
 
 	"github.com/pkg/errors"
@@ -13,8 +14,11 @@ type CPUInfo struct {
 	PhysicalCount int `json:"physicalCount"`
 }
 
+const HostCPUPath = `host-collectors/system/cpu.json`
+
 type CollectHostCPU struct {
 	hostCollector *troubleshootv1beta2.CPU
+	BundlePath    string
 }
 
 func (c *CollectHostCPU) Title() string {
@@ -45,7 +49,10 @@ func (c *CollectHostCPU) Collect(progressChan chan<- interface{}) (map[string][]
 		return nil, errors.Wrap(err, "failed to marshal cpu info")
 	}
 
+	output := NewResult()
+	output.SaveResult(c.BundlePath, HostCPUPath, bytes.NewBuffer(b))
+
 	return map[string][]byte{
-		"system/cpu.json": b,
+		HostCPUPath: b,
 	}, nil
 }

pkg/collect/host_disk_usage.go

@@ -1,6 +1,7 @@
 package collect
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -18,6 +19,7 @@ type DiskUsageInfo struct {
 
 type CollectHostDiskUsage struct {
 	hostCollector *troubleshootv1beta2.DiskUsage
+	BundlePath    string
 }
 
 func (c *CollectHostDiskUsage) Title() string {
@@ -32,7 +34,7 @@ func (c *CollectHostDiskUsage) Collect(progressChan chan<- interface{}) (map[str
 	result := map[string][]byte{}
 
 	if c.hostCollector == nil {
-		return result, nil
+		return map[string][]byte{}, nil
 	}
 
 	pathExists, err := traverseFiletreeDirExists(c.hostCollector.Path)
@@ -52,16 +54,21 @@ func (c *CollectHostDiskUsage) Collect(progressChan chan<- interface{}) (map[str
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to marshal disk space info")
 	}
-	key := HostDiskUsageKey(c.hostCollector.CollectorName)
-	result[key] = b
+
+	collectorName := c.hostCollector.CollectorName
+	if collectorName == "" {
+		collectorName = "diskUsage"
+	}
+	name := filepath.Join("host-collectors/diskUsage", collectorName+".json")
+
+	result[name] = b
+
+	output := NewResult()
+	output.SaveResult(c.BundlePath, name, bytes.NewBuffer(b))
 
 	return result, nil
 }
 
-func HostDiskUsageKey(name string) string {
-	return fmt.Sprintf("diskUsage/%s.json", name)
-}
-
 func traverseFiletreeDirExists(filename string) (string, error) {
 	filename = filepath.Clean(filename)
 	for i := 0; i < 50; i++ {

pkg/collect/host_filesystem_performance.go

@@ -16,6 +16,7 @@ func init() {
 
 type CollectHostFilesystemPerformance struct {
 	hostCollector *troubleshootv1beta2.FilesystemPerformance
+	BundlePath    string
 }
 
 func (c *CollectHostFilesystemPerformance) Title() string {
@@ -27,7 +28,7 @@ func (c *CollectHostFilesystemPerformance) IsExcluded() (bool, error) {
 }
 
 func (c *CollectHostFilesystemPerformance) Collect(progressChan chan<- interface{}) (map[string][]byte, error) {
-	return collectHostFilesystemPerformance(c.hostCollector)
+	return collectHostFilesystemPerformance(c.hostCollector, c.BundlePath)
 }
 
 type FSPerfResults struct {

pkg/collect/host_filesystem_performance_darwin.go

@@ -5,6 +5,6 @@ import (
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
 )
 
-func collectHostFilesystemPerformance(hostCollector *troubleshootv1beta2.FilesystemPerformance) (map[string][]byte, error) {
+func collectHostFilesystemPerformance(hostCollector *troubleshootv1beta2.FilesystemPerformance, bundlePath string) (map[string][]byte, error) {
 	return nil, errors.New("Filesystem performance collector is only implemented for Linux")
 }

pkg/collect/host_filesystem_performance_linux.go

@@ -1,6 +1,7 @@
 package collect
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -37,7 +38,7 @@ func (d Durations) Swap(i, j int) {
 	d[i], d[j] = d[j], d[i]
 }
 
-func collectHostFilesystemPerformance(hostCollector *troubleshootv1beta2.FilesystemPerformance) (map[string][]byte, error) {
+func collectHostFilesystemPerformance(hostCollector *troubleshootv1beta2.FilesystemPerformance, bundlePath string) (map[string][]byte, error) {
 	timeout := time.Minute
 	if hostCollector.Timeout != "" {
 		d, err := time.ParseDuration(hostCollector.Timeout)
@@ -198,12 +199,15 @@ func collectHostFilesystemPerformance(hostCollector *troubleshootv1beta2.Filesys
 	if collectorName == "" {
 		collectorName = "filesystemPerformance"
 	}
-	name := filepath.Join("filesystemPerformance", collectorName+".json")
+	name := filepath.Join("host-collectors/filesystemPerformance", collectorName+".json")
 	b, err := json.Marshal(fsPerf)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to marshal fs perf results")
 	}
 
+	output := NewResult()
+	output.SaveResult(bundlePath, name, bytes.NewBuffer(b))
+
 	return map[string][]byte{
 		name: b,
 	}, nil

pkg/collect/host_filesystem_performance_windows.go

@@ -5,6 +5,6 @@ import (
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
 )
 
-func collectHostFilesystemPerformance(hostCollector *troubleshootv1beta2.FilesystemPerformance) (map[string][]byte, error) {
+func collectHostFilesystemPerformance(hostCollector *troubleshootv1beta2.FilesystemPerformance, bundlePath string) (map[string][]byte, error) {
 	return nil, errors.New("Filesystem performance collector is only implemented for Linux")
 }

pkg/collect/host_http.go

@@ -1,6 +1,7 @@
 package collect
 
 import (
+	"bytes"
 	"net/http"
 	"path/filepath"
 
@@ -10,6 +11,7 @@ import (
 
 type CollectHostHTTP struct {
 	hostCollector *troubleshootv1beta2.HostHTTP
+	BundlePath    string
 }
 
 func (c *CollectHostHTTP) Title() string {
@@ -36,17 +38,22 @@ func (c *CollectHostHTTP) Collect(progressChan chan<- interface{}) (map[string][
 		return nil, errors.New("no supported http request type")
 	}
 
-	output, err := responseToOutput(response, err, false)
+	responseOutput, err := responseToOutput(response, err, false)
 	if err != nil {
 		return nil, err
 	}
 
-	fileName := "result.json"
-	if httpCollector.CollectorName != "" {
-		fileName = httpCollector.CollectorName + ".json"
+	collectorName := c.hostCollector.CollectorName
+	if collectorName == "" {
+		collectorName = "result"
 	}
+	name := filepath.Join("host-collectors/http", collectorName+".json")
+
+	output := NewResult()
+	output.SaveResult(c.BundlePath, name, bytes.NewBuffer(responseOutput))
+
 	httpOutput := map[string][]byte{
-		filepath.Join("http", fileName): output,
+		name: responseOutput,
 	}
 
 	return httpOutput, nil

pkg/collect/host_httploadbalancer.go

@@ -8,7 +8,7 @@ import (
 	"io/ioutil"
 	"net"
 	"net/http"
-	"path"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -20,6 +20,7 @@ import (
 
 type CollectHostHTTPLoadBalancer struct {
 	hostCollector *troubleshootv1beta2.HTTPLoadBalancer
+	BundlePath    string
 }
 
 func (c *CollectHostHTTPLoadBalancer) Title() string {
@@ -120,10 +121,14 @@ func (c *CollectHostHTTPLoadBalancer) Collect(progressChan chan<- interface{}) (
 		return nil, errors.Wrap(err, "failed to marshal result")
 	}
 
-	name := path.Join("httpLoadBalancer", "httpLoadBalancer.json")
-	if c.hostCollector.CollectorName != "" {
-		name = path.Join("httpLoadBalancer", fmt.Sprintf("%s.json", c.hostCollector.CollectorName))
+	collectorName := c.hostCollector.CollectorName
+	if collectorName == "" {
+		collectorName = "httpLoadBalancer"
 	}
+	name := filepath.Join("host-collectors/httpLoadBalancer", collectorName+".json")
+
+	output := NewResult()
+	output.SaveResult(c.BundlePath, name, bytes.NewBuffer(b))
 
 	return map[string][]byte{
 		name: b,

pkg/collect/host_ipv4interfaces.go

@@ -1,6 +1,7 @@
 package collect
 
 import (
+	"bytes"
 	"encoding/json"
 	"net"
 
@@ -8,8 +9,11 @@ import (
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
 )
 
+const HostIPV4InterfacesPath = `host-collectors/system/ipv4Interfaces.json`
+
 type CollectHostIPV4Interfaces struct {
 	hostCollector *troubleshootv1beta2.IPV4Interfaces
+	BundlePath    string
 }
 
 func (c *CollectHostIPV4Interfaces) Title() string {
@@ -47,7 +51,10 @@ func (c *CollectHostIPV4Interfaces) Collect(progressChan chan<- interface{}) (ma
 		return nil, errors.Wrap(err, "failed to marshal network interfaces")
 	}
 
+	output := NewResult()
+	output.SaveResult(c.BundlePath, HostIPV4InterfacesPath, bytes.NewBuffer(b))
+
 	return map[string][]byte{
-		"system/ipv4Interfaces.json": b,
+		HostIPV4InterfacesPath: b,
 	}, nil
 }

pkg/collect/host_kernel_modules.go

@@ -30,6 +30,8 @@ type KernelModuleInfo struct {
 	Status    KernelModuleStatus `json:"status"`
 }
 
+const HostKernelModulesPath = `host-collectors/system/kernel_modules.json`
+
 // kernelModuleCollector defines the interface used to collect modules from the
 // underlying host.
 type kernelModuleCollector interface {
@@ -40,6 +42,7 @@ type kernelModuleCollector interface {
 // from the host.
 type CollectHostKernelModules struct {
 	hostCollector *troubleshootv1beta2.HostKernelModules
+	BundlePath    string
 	loadable      kernelModuleCollector
 	loaded        kernelModuleCollector
 }
@@ -95,8 +98,11 @@ func (c *CollectHostKernelModules) Collect(progressChan chan<- interface{}) (map
 		return nil, errors.Wrap(err, "failed to marshal kernel modules")
 	}
 
+	output := NewResult()
+	output.SaveResult(c.BundlePath, HostKernelModulesPath, bytes.NewBuffer(b))
+
 	return map[string][]byte{
-		"system/kernel_modules.json": b,
+		HostKernelModulesPath: b,
 	}, nil
 }
 

pkg/collect/host_kernel_modules_test.go

@@ -45,7 +45,7 @@ func TestCollectHostKernelModules_Collect(t *testing.T) {
 			},
 			loaded: mockKernelModulesCollector{},
 			want: map[string][]byte{
-				"system/kernel_modules.json": []byte("{\"first\":{\"size\":0,\"instances\":0,\"status\":\"loadable\"},\"second\":{\"size\":0,\"instances\":0,\"status\":\"loadable\"}}"),
+				"host-collectors/system/kernel_modules.json": []byte("{\"first\":{\"size\":0,\"instances\":0,\"status\":\"loadable\"},\"second\":{\"size\":0,\"instances\":0,\"status\":\"loadable\"}}"),
 			},
 		},
 		{
@@ -64,7 +64,7 @@ func TestCollectHostKernelModules_Collect(t *testing.T) {
 				},
 			},
 			want: map[string][]byte{
-				"system/kernel_modules.json": []byte("{\"first\":{\"size\":10,\"instances\":2,\"status\":\"loaded\"},\"second\":{\"size\":0,\"instances\":0,\"status\":\"loading\"}}"),
+				"host-collectors/system/kernel_modules.json": []byte("{\"first\":{\"size\":10,\"instances\":2,\"status\":\"loaded\"},\"second\":{\"size\":0,\"instances\":0,\"status\":\"loading\"}}"),
 			},
 		},
 		{
@@ -89,7 +89,7 @@ func TestCollectHostKernelModules_Collect(t *testing.T) {
 				},
 			},
 			want: map[string][]byte{
-				"system/kernel_modules.json": []byte("{\"first\":{\"size\":10,\"instances\":2,\"status\":\"loaded\"},\"second\":{\"size\":0,\"instances\":0,\"status\":\"loadable\"}}"),
+				"host-collectors/system/kernel_modules.json": []byte("{\"first\":{\"size\":10,\"instances\":2,\"status\":\"loaded\"},\"second\":{\"size\":0,\"instances\":0,\"status\":\"loadable\"}}"),
 			},
 		},
 		{

pkg/collect/host_memory.go

@@ -1,6 +1,7 @@
 package collect
 
 import (
+	"bytes"
 	"encoding/json"
 
 	"github.com/pkg/errors"
@@ -12,8 +13,11 @@ type MemoryInfo struct {
 	Total uint64 `json:"total"`
 }
 
+const HostMemoryPath = `host-collectors/system/memory.json`
+
 type CollectHostMemory struct {
 	hostCollector *troubleshootv1beta2.Memory
+	BundlePath    string
 }
 
 func (c *CollectHostMemory) Title() string {
@@ -38,7 +42,10 @@ func (c *CollectHostMemory) Collect(progressChan chan<- interface{}) (map[string
 		return nil, errors.Wrap(err, "failed to marshal memory info")
 	}
 
+	output := NewResult()
+	output.SaveResult(c.BundlePath, HostMemoryPath, bytes.NewBuffer(b))
+
 	return map[string][]byte{
-		"system/memory.json": b,
+		HostMemoryPath: b,
 	}, nil
 }

pkg/collect/host_os_info.go

@@ -1,6 +1,7 @@
 package collect
 
 import (
+	"bytes"
 	"encoding/json"
 
 	"github.com/pkg/errors"
@@ -15,8 +16,11 @@ type HostOSInfo struct {
 	Platform        string `json:"platform"`
 }
 
+const HostOSInfoPath = `host-collectors/system/hostos_info.json`
+
 type CollectHostOS struct {
 	hostCollector *troubleshootv1beta2.HostOS
+	BundlePath    string
 }
 
 func (c *CollectHostOS) Title() string {
@@ -43,7 +47,10 @@ func (c *CollectHostOS) Collect(progressChan chan<- interface{}) (map[string][]b
 		return nil, errors.Wrap(err, "failed to marshal host os info")
 	}
 
+	output := NewResult()
+	output.SaveResult(c.BundlePath, HostOSInfoPath, bytes.NewBuffer(b))
+
 	return map[string][]byte{
-		"system/hostos_info.json": b,
+		HostOSInfoPath: b,
 	}, nil
 }

pkg/collect/host_services.go

@@ -19,10 +19,11 @@ type ServiceInfo struct {
 }
 
 const systemctlFormat = `%s %s %s %s` // this leaves off the description
-const HostServicesPath = `system/systemctl_services.json`
+const HostServicesPath = `host-collectors/system/systemctl_services.json`
 
 type CollectHostServices struct {
 	hostCollector *troubleshootv1beta2.HostServices
+	BundlePath    string
 }
 
 func (c *CollectHostServices) Title() string {
@@ -63,6 +64,9 @@ func (c *CollectHostServices) Collect(progressChan chan<- interface{}) (map[stri
 		return nil, errors.Wrap(err, "failed to marshal systemctl service info")
 	}
 
+	output := NewResult()
+	output.SaveResult(c.BundlePath, HostServicesPath, bytes.NewBuffer(b))
+
 	return map[string][]byte{
 		HostServicesPath: b,
 	}, nil

pkg/collect/host_system_package.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os/exec"
+	"path/filepath"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -28,6 +29,7 @@ type SystemPackage struct {
 
 type CollectHostSystemPackages struct {
 	hostCollector *troubleshootv1beta2.HostSystemPackages
+	BundlePath    string
 }
 
 func (c *CollectHostSystemPackages) Title() string {
@@ -162,13 +164,17 @@ func (c *CollectHostSystemPackages) Collect(progressChan chan<- interface{}) (ma
 		return nil, errors.Wrap(err, "failed to marshal system packages info")
 	}
 
-	outputFileName := "system/packages.json"
-	if c.hostCollector.CollectorName != "" {
-		outputFileName = fmt.Sprintf("system/%s-packages.json", c.hostCollector.CollectorName)
+	collectorName := c.hostCollector.CollectorName
+	if collectorName == "" {
+		collectorName = "packages"
 	}
+	name := filepath.Join("host-collectors/system", collectorName+"-packages.json")
+
+	output := NewResult()
+	output.SaveResult(c.BundlePath, name, bytes.NewBuffer(b))
 
 	return map[string][]byte{
-		outputFileName: b,
+		name: b,
 	}, nil
 }
 

pkg/collect/host_tcp_connect.go

@@ -1,10 +1,10 @@
 package collect
 
 import (
+	"bytes"
 	"encoding/json"
-	"fmt"
 	"net"
-	"path"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -14,6 +14,7 @@ import (
 
 type CollectHostTCPConnect struct {
 	hostCollector *troubleshootv1beta2.TCPConnect
+	BundlePath    string
 }
 
 func (c *CollectHostTCPConnect) Title() string {
@@ -45,7 +46,14 @@ func (c *CollectHostTCPConnect) Collect(progressChan chan<- interface{}) (map[st
 		return nil, errors.Wrap(err, "failed to marshal result")
 	}
 
-	name := path.Join("connect", fmt.Sprintf("%s.json", c.hostCollector.CollectorName))
+	collectorName := c.hostCollector.CollectorName
+	if collectorName == "" {
+		collectorName = "connect"
+	}
+	name := filepath.Join("host-collectors/connect", collectorName+".json")
+
+	output := NewResult()
+	output.SaveResult(c.BundlePath, name, bytes.NewBuffer(b))
 
 	return map[string][]byte{
 		name: b,

pkg/collect/host_tcploadbalancer.go

@@ -1,9 +1,10 @@
 package collect
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
-	"path"
+	"path/filepath"
 	"time"
 
 	"github.com/pkg/errors"
@@ -12,6 +13,7 @@ import (
 
 type CollectHostTCPLoadBalancer struct {
 	hostCollector *troubleshootv1beta2.TCPLoadBalancer
+	BundlePath    string
 }
 
 func (c *CollectHostTCPLoadBalancer) Title() string {
@@ -26,10 +28,13 @@ func (c *CollectHostTCPLoadBalancer) Collect(progressChan chan<- interface{}) (m
 	listenAddress := fmt.Sprintf("0.0.0.0:%d", c.hostCollector.Port)
 	dialAddress := c.hostCollector.Address
 
-	name := path.Join("tcpLoadBalancer", "tcpLoadBalancer.json")
-	if c.hostCollector.CollectorName != "" {
-		name = path.Join("tcpLoadBalancer", fmt.Sprintf("%s.json", c.hostCollector.CollectorName))
+	collectorName := c.hostCollector.CollectorName
+	if collectorName == "" {
+		collectorName = "tcpLoadBalancer"
 	}
+	name := filepath.Join("host-collectors/tcpLoadBalancer", collectorName+".json")
+
+	output := NewResult()
 
 	timeout := 60 * time.Minute
 	if c.hostCollector.Timeout != "" {
@@ -50,6 +55,8 @@ func (c *CollectHostTCPLoadBalancer) Collect(progressChan chan<- interface{}) (m
 			return nil, errors.Wrap(err, "failed to marshal result")
 		}
 
+		output.SaveResult(c.BundlePath, name, bytes.NewBuffer(b))
+
 		return map[string][]byte{
 			name: b,
 		}, err
@@ -63,6 +70,8 @@ func (c *CollectHostTCPLoadBalancer) Collect(progressChan chan<- interface{}) (m
 		return nil, errors.Wrap(err, "failed to marshal result")
 	}
 
+	output.SaveResult(c.BundlePath, name, bytes.NewBuffer(b))
+
 	return map[string][]byte{
 		name: b,
 	}, nil

pkg/collect/host_tcpportstatus.go

@@ -1,10 +1,11 @@
 package collect
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"net"
-	"path"
+	"path/filepath"
 	"time"
 
 	"github.com/pkg/errors"
@@ -13,6 +14,7 @@ import (
 
 type CollectHostTCPPortStatus struct {
 	hostCollector *troubleshootv1beta2.TCPPortStatus
+	BundlePath    string
 }
 
 func (c *CollectHostTCPPortStatus) Title() string {
@@ -61,10 +63,15 @@ func (c *CollectHostTCPPortStatus) Collect(progressChan chan<- interface{}) (map
 		return nil, errors.Wrap(err, "failed to marshal result")
 	}
 
-	name := path.Join("tcpPortStatus", "tcpPortStatus.json")
-	if c.hostCollector.CollectorName != "" {
-		name = path.Join("tcpPortStatus", fmt.Sprintf("%s.json", c.hostCollector.CollectorName))
+	collectorName := c.hostCollector.CollectorName
+	if collectorName == "" {
+		collectorName = "tcpPortStatus"
 	}
+	name := filepath.Join("host-collectors/tcpPortStatus", collectorName+".json")
+
+	output := NewResult()
+	output.SaveResult(c.BundlePath, name, bytes.NewBuffer(b))
+
 	return map[string][]byte{
 		name: b,
 	}, nil

pkg/collect/host_time.go

@@ -1,6 +1,7 @@
 package collect
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -19,8 +20,11 @@ type TimeInfo struct {
 	NTPActive       bool   `json:"ntp_active"`
 }
 
+const HostTimePath = `host-collectors/system/time.json`
+
 type CollectHostTime struct {
 	hostCollector *troubleshootv1beta2.HostTime
+	BundlePath    string
 }
 
 func (c *CollectHostTime) Title() string {
@@ -90,7 +94,10 @@ func (c *CollectHostTime) Collect(progressChan chan<- interface{}) (map[string][
 		return nil, errors.Wrap(err, "failed to marshal time info")
 	}
 
+	output := NewResult()
+	output.SaveResult(c.BundlePath, HostTimePath, bytes.NewBuffer(b))
+
 	return map[string][]byte{
-		"system/time.json": b,
+		HostTimePath: b,
 	}, nil
 }

pkg/collect/longhorn.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"path"
 	"path/filepath"
 	"regexp"
 	"sync"
@@ -205,9 +206,12 @@ func Longhorn(c *Collector, longhornCollector *troubleshootv1beta2.Longhorn) (Co
 		return nil, errors.Wrap(err, "collect longhorn logs")
 	}
 	logsDir := GetLonghornLogsDirectory(ns)
-	for key, log := range logs {
-		key = filepath.Join(logsDir, key)
-		output.SaveResult(c.BundlePath, key, bytes.NewBuffer(log))
+	for srcFilename, _ := range logs {
+		dstFileName := path.Join(logsDir, srcFilename)
+		err := copyResult(logs, output, c.BundlePath, srcFilename, dstFileName)
+		if err != nil {
+			logger.Printf("Failed to copy file %s; %v", srcFilename, err)
+		}
 	}
 
 	// https://longhorn.io/docs/1.1.1/advanced-resources/data-recovery/corrupted-replica/

pkg/collect/mysql.go

@@ -18,8 +18,10 @@ func Mysql(c *Collector, databaseCollector *troubleshootv1beta2.Database) (Colle
 	if err != nil {
 		databaseConnection.Error = err.Error()
 	} else {
+		defer db.Close()
 		query := `select version()`
 		row := db.QueryRow(query)
+
 		version := ""
 		if err := row.Scan(&version); err != nil {
 			databaseConnection.Error = err.Error()
@@ -27,6 +29,38 @@ func Mysql(c *Collector, databaseCollector *troubleshootv1beta2.Database) (Colle
 			databaseConnection.IsConnected = true
 			databaseConnection.Version = version
 		}
+
+		requestedParameters := databaseCollector.Parameters
+		if len(requestedParameters) > 0 {
+			rows, err := db.Query("SHOW VARIABLES")
+
+			if err != nil {
+				databaseConnection.Error = err.Error()
+			} else {
+				defer rows.Close()
+
+				variables := map[string]string{}
+				for rows.Next() {
+					var key, value string
+					err = rows.Scan(&key, &value)
+					if err != nil {
+						databaseConnection.Error = err.Error()
+						break
+					}
+					variables[key] = value
+				}
+				filteredVariables := map[string]string{}
+
+				for _, key := range requestedParameters {
+					if value, ok := variables[key]; ok {
+						filteredVariables[key] = value
+					}
+
+				}
+				databaseConnection.Variables = filteredVariables
+			}
+		}
+
 	}
 
 	b, err := json.Marshal(databaseConnection)

pkg/collect/redact.go

@@ -26,9 +26,7 @@ func redactResult(bundlePath string, input CollectorResult, additionalRedactors
 				}
 				return errors.Wrap(err, "failed to get reader")
 			}
-			if r, ok := r.(io.ReadCloser); ok {
-				defer r.Close()
-			}
+			defer r.Close()
 
 			reader = r
 		} else {

pkg/collect/result.go

@@ -85,9 +85,9 @@ func (r CollectorResult) ReplaceResult(bundlePath string, relativePath string, r
 	return nil
 }
 
-func (r CollectorResult) GetReader(bundlePath string, relativePath string) (io.Reader, error) {
+func (r CollectorResult) GetReader(bundlePath string, relativePath string) (io.ReadCloser, error) {
 	if r[relativePath] != nil {
-		return bytes.NewReader(r[relativePath]), nil
+		return ioutil.NopCloser(bytes.NewReader(r[relativePath])), nil
 	}
 
 	if bundlePath == "" {

pkg/collect/run.go

@@ -16,6 +16,48 @@ import (
 )
 
 func Run(c *Collector, runCollector *troubleshootv1beta2.Run) (CollectorResult, error) {
+	pullPolicy := corev1.PullIfNotPresent
+	if runCollector.ImagePullPolicy != "" {
+		pullPolicy = corev1.PullPolicy(runCollector.ImagePullPolicy)
+	}
+
+	namespace := "default"
+	if runCollector.Namespace != "" {
+		namespace = runCollector.Namespace
+	}
+
+	serviceAccountName := "default"
+	if runCollector.ServiceAccountName != "" {
+		serviceAccountName = runCollector.ServiceAccountName
+	}
+
+	runPodCollector := &troubleshootv1beta2.RunPod{
+		CollectorMeta: troubleshootv1beta2.CollectorMeta{
+			CollectorName: runCollector.CollectorName,
+		},
+		Name:            runCollector.Name,
+		Namespace:       namespace,
+		Timeout:         runCollector.Timeout,
+		ImagePullSecret: runCollector.ImagePullSecret,
+		PodSpec: corev1.PodSpec{
+			RestartPolicy:      corev1.RestartPolicyNever,
+			ServiceAccountName: serviceAccountName,
+			Containers: []corev1.Container{
+				{
+					Image:           runCollector.Image,
+					ImagePullPolicy: pullPolicy,
+					Name:            "collector",
+					Command:         runCollector.Command,
+					Args:            runCollector.Args,
+				},
+			},
+		},
+	}
+
+	return RunPod(c, runPodCollector)
+}
+
+func RunPod(c *Collector, runPodCollector *troubleshootv1beta2.RunPod) (CollectorResult, error) {
 	ctx := context.Background()
 
 	client, err := kubernetes.NewForConfig(c.ClientConfig)
@@ -23,7 +65,7 @@ func Run(c *Collector, runCollector *troubleshootv1beta2.Run) (CollectorResult,
 		return nil, errors.Wrap(err, "failed to create client from config")
 	}
 
-	pod, err := runPod(ctx, client, runCollector, c.Namespace)
+	pod, err := runPodWithSpec(ctx, client, runPodCollector)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to run pod")
 	}
@@ -33,7 +75,7 @@ func Run(c *Collector, runCollector *troubleshootv1beta2.Run) (CollectorResult,
 			logger.Printf("Failed to delete pod %s: %v", pod.Name, err)
 		}
 	}()
-	if runCollector.ImagePullSecret != nil && runCollector.ImagePullSecret.Data != nil {
+	if runPodCollector.ImagePullSecret != nil && runPodCollector.ImagePullSecret.Data != nil {
 		defer func() {
 			for _, k := range pod.Spec.ImagePullSecrets {
 				if err := client.CoreV1().Secrets(pod.Namespace).Delete(ctx, k.Name, metav1.DeleteOptions{}); err != nil {
@@ -42,11 +84,11 @@ func Run(c *Collector, runCollector *troubleshootv1beta2.Run) (CollectorResult,
 			}
 		}()
 	}
-	if runCollector.Timeout == "" {
-		return runWithoutTimeout(ctx, c, pod, runCollector)
+	if runPodCollector.Timeout == "" {
+		return runWithoutTimeout(ctx, c, pod, runPodCollector)
 	}
 
-	timeout, err := time.ParseDuration(runCollector.Timeout)
+	timeout, err := time.ParseDuration(runPodCollector.Timeout)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to parse timeout")
 	}
@@ -58,7 +100,7 @@ func Run(c *Collector, runCollector *troubleshootv1beta2.Run) (CollectorResult,
 	defer cancel()
 
 	go func() {
-		b, err := runWithoutTimeout(timeoutCtx, c, pod, runCollector)
+		b, err := runWithoutTimeout(timeoutCtx, c, pod, runPodCollector)
 		if err != nil {
 			errCh <- err
 		} else {
@@ -76,7 +118,52 @@ func Run(c *Collector, runCollector *troubleshootv1beta2.Run) (CollectorResult,
 	}
 }
 
-func runWithoutTimeout(ctx context.Context, c *Collector, pod *corev1.Pod, runCollector *troubleshootv1beta2.Run) (CollectorResult, error) {
+func runPodWithSpec(ctx context.Context, client *kubernetes.Clientset, runPodCollector *troubleshootv1beta2.RunPod) (*corev1.Pod, error) {
+	podLabels := make(map[string]string)
+	podLabels["troubleshoot-role"] = "run-collector"
+
+	namespace := "default"
+	if runPodCollector.Namespace != "" {
+		namespace = runPodCollector.Namespace
+	}
+
+	podName := "run-pod"
+	if runPodCollector.CollectorName != "" {
+		podName = runPodCollector.CollectorName
+	} else if runPodCollector.Name != "" {
+		podName = runPodCollector.Name
+	}
+
+	pod := corev1.Pod{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      podName,
+			Namespace: namespace,
+			Labels:    podLabels,
+		},
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "Pod",
+		},
+		Spec: runPodCollector.PodSpec,
+	}
+
+	if runPodCollector.ImagePullSecret != nil && runPodCollector.ImagePullSecret.Data != nil {
+		secretName, err := createSecret(ctx, client, pod.Namespace, runPodCollector.ImagePullSecret)
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to create secret")
+		}
+		pod.Spec.ImagePullSecrets = append(pod.Spec.ImagePullSecrets, corev1.LocalObjectReference{Name: secretName})
+	}
+
+	created, err := client.CoreV1().Pods(namespace).Create(ctx, &pod, metav1.CreateOptions{})
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to create pod")
+	}
+
+	return created, nil
+}
+
+func runWithoutTimeout(ctx context.Context, c *Collector, pod *corev1.Pod, runPodCollector *troubleshootv1beta2.RunPod) (CollectorResult, error) {
 	client, err := kubernetes.NewForConfig(c.ClientConfig)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed create client from config")
@@ -104,10 +191,12 @@ func runWithoutTimeout(ctx context.Context, c *Collector, pod *corev1.Pod, runCo
 
 	output := NewResult()
 
+	collectorName := runPodCollector.Name
+
 	limits := troubleshootv1beta2.LogLimits{
 		MaxLines: 10000,
 	}
-	podLogs, err := savePodLogs(ctx, c.BundlePath, client, *pod, runCollector.Name, "", &limits, true)
+	podLogs, err := savePodLogs(ctx, c.BundlePath, client, *pod, collectorName, "", &limits, true)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get pod logs")
 	}
@@ -119,61 +208,6 @@ func runWithoutTimeout(ctx context.Context, c *Collector, pod *corev1.Pod, runCo
 	return output, nil
 }
 
-func runPod(ctx context.Context, client *kubernetes.Clientset, runCollector *troubleshootv1beta2.Run, namespace string) (*corev1.Pod, error) {
-	podLabels := make(map[string]string)
-	podLabels["troubleshoot-role"] = "run-collector"
-
-	pullPolicy := corev1.PullIfNotPresent
-	if runCollector.ImagePullPolicy != "" {
-		pullPolicy = corev1.PullPolicy(runCollector.ImagePullPolicy)
-	}
-
-	if namespace == "" {
-		namespace = runCollector.Namespace
-	}
-	if namespace == "" {
-		namespace = "default"
-	}
-
-	pod := corev1.Pod{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      runCollector.CollectorName,
-			Namespace: namespace,
-			Labels:    podLabels,
-		},
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "v1",
-			Kind:       "Pod",
-		},
-		Spec: corev1.PodSpec{
-			RestartPolicy: corev1.RestartPolicyNever,
-			Containers: []corev1.Container{
-				{
-					Image:           runCollector.Image,
-					ImagePullPolicy: pullPolicy,
-					Name:            "collector",
-					Command:         runCollector.Command,
-					Args:            runCollector.Args,
-				},
-			},
-		},
-	}
-
-	if runCollector.ImagePullSecret != nil && runCollector.ImagePullSecret.Data != nil {
-		secretName, err := createSecret(ctx, client, pod.Namespace, runCollector.ImagePullSecret)
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to create secret")
-		}
-		pod.Spec.ImagePullSecrets = append(pod.Spec.ImagePullSecrets, corev1.LocalObjectReference{Name: secretName})
-	}
-	created, err := client.CoreV1().Pods(namespace).Create(ctx, &pod, metav1.CreateOptions{})
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to create pod")
-	}
-
-	return created, nil
-}
-
 func createSecret(ctx context.Context, client kubernetes.Interface, namespace string, imagePullSecret *troubleshootv1beta2.ImagePullSecrets) (string, error) {
 	if imagePullSecret.Data == nil {
 		return "", nil

pkg/k8sutil/pod.go

@@ -114,13 +114,20 @@ func IsPodUnhealthy(pod *corev1.Pod) bool {
 	}
 
 	reason := GetPodStatusReason(pod)
-
-	switch PodStatusReason(reason) {
-	case PodStatusReasonRunning:
-		fallthrough
-	case PodStatusReasonCompleted:
-		return false
+	if PodStatusReason(reason) == PodStatusReasonCompleted {
+		return false // completed pods are healthy pods
 	}
 
-	return true
+	if PodStatusReason(reason) != PodStatusReasonRunning {
+		return true // pods that are not completed or running are unhealthy
+	}
+
+	// running pods with unready containers are not healthy
+	for _, containerStatus := range pod.Status.ContainerStatuses {
+		if !containerStatus.Ready {
+			return true
+		}
+	}
+
+	return false
 }

pkg/k8sutil/pod_test.go

@@ -0,0 +1,101 @@
+package k8sutil
+
+import (
+	"github.com/stretchr/testify/require"
+	corev1 "k8s.io/api/core/v1"
+	"testing"
+)
+
+func TestIsPodUnhealthy(t *testing.T) {
+	andTrue := true
+	tests := []struct {
+		name string
+		pod  *corev1.Pod
+		want bool
+	}{
+		{
+			name: "healthy pod with init containers",
+			want: false,
+			pod: &corev1.Pod{
+				Status: corev1.PodStatus{
+					Phase:      "Running",
+					Conditions: []corev1.PodCondition{
+						// ignored here
+					},
+					InitContainerStatuses: []corev1.ContainerStatus{
+						{
+							Name: "init",
+							State: corev1.ContainerState{
+								Terminated: &corev1.ContainerStateTerminated{
+									ExitCode: 0,
+									Reason:   "Completed",
+								},
+							},
+							Ready:        true,
+							RestartCount: 2,
+							Image:        "projectcontour/contour:v1.11.0",
+							ImageID:      "docker://sha256:12878e02b6f969de1456b51b0093f289fd195db956837ccd75aa679e9dac24d9",
+							ContainerID:  "docker://50fc0794fa1402b1a48521e2fd380a92521a69db70ad25c9699c91fccd839d70",
+						},
+					},
+					ContainerStatuses: []corev1.ContainerStatus{
+						{
+							Name: "contour",
+							State: corev1.ContainerState{
+								Running: &corev1.ContainerStateRunning{},
+							},
+							Ready:        true,
+							RestartCount: 5,
+							Image:        "projectcontour/contour:v1.11.0",
+							ImageID:      "docker://sha256:12878e02b6f969de1456b51b0093f289fd195db956837ccd75aa679e9dac24d9",
+							ContainerID:  "docker://50fc0794fa1402b1a48521e2fd380a92521a69db70ad25c9699c91fccd839d70",
+							Started:      &andTrue,
+						},
+					},
+					QOSClass: corev1.PodQOSBestEffort,
+				},
+			},
+		},
+		{
+			name: "running pod with one unhealthy container",
+			want: true,
+			pod: &corev1.Pod{
+				Status: corev1.PodStatus{
+					Phase:      "Running",
+					Conditions: []corev1.PodCondition{
+						// ignored here
+					},
+					ContainerStatuses: []corev1.ContainerStatus{
+						{
+							Name: "envoy",
+							State: corev1.ContainerState{
+								Running: &corev1.ContainerStateRunning{},
+							},
+							Ready:        false,
+							RestartCount: 5,
+							Started:      &andTrue,
+						},
+						{
+							Name: "shutdown-manager",
+							State: corev1.ContainerState{
+								Running: &corev1.ContainerStateRunning{},
+							},
+							Ready:        true,
+							RestartCount: 5,
+							Started:      &andTrue,
+						},
+					},
+					QOSClass: corev1.PodQOSBestEffort,
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := require.New(t)
+
+			got := IsPodUnhealthy(tt.pod)
+			req.Equal(tt.want, got)
+		})
+	}
+}

pkg/longhorn/util/util.go

@@ -23,9 +23,9 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/gorilla/handlers"
 	"github.com/pkg/errors"
-	uuid "github.com/satori/go.uuid"
 	"github.com/sirupsen/logrus"
 
 	v1 "k8s.io/api/core/v1"
@@ -138,7 +138,7 @@ func Backoff(maxDuration time.Duration, timeoutMessage string, f func() (bool, e
 }
 
 func UUID() string {
-	return uuid.NewV4().String()
+	return uuid.NewString()
 }
 
 // WaitForDevice timeout in second

pkg/multitype/boolstring.go

@@ -5,6 +5,7 @@ package multitype
 import (
 	"encoding/json"
 	"fmt"
+	"strconv"
 
 	fuzz "github.com/google/gofuzz"
 )
@@ -33,22 +34,25 @@ const (
 )
 
 // FromBool creates an BoolOrString object with a bool value.
-func FromBool(val bool) BoolOrString {
-	return BoolOrString{Type: Bool, BoolVal: val}
+func FromBool(val bool) *BoolOrString {
+	return &BoolOrString{Type: Bool, BoolVal: val}
 }
 
 // FromString creates an BoolOrString object with a string value.
-func FromString(val string) BoolOrString {
-	return BoolOrString{Type: String, StrVal: val}
+func FromString(val string) *BoolOrString {
+	return &BoolOrString{Type: String, StrVal: val}
 }
 
 // Parse the given string
-func Parse(val string) BoolOrString {
+func Parse(val string) *BoolOrString {
 	return FromString(val)
 }
 
 // UnmarshalJSON implements the json.Unmarshaller boolerface.
 func (boolstr *BoolOrString) UnmarshalJSON(value []byte) error {
+	if boolstr == nil {
+		return nil
+	}
 	if value[0] == '"' {
 		boolstr.Type = String
 		return json.Unmarshal(value, &boolstr.StrVal)
@@ -59,6 +63,9 @@ func (boolstr *BoolOrString) UnmarshalJSON(value []byte) error {
 
 // String returns the string value, '1' for true, or '0' for false.
 func (boolstr *BoolOrString) String() string {
+	if boolstr == nil {
+		return "0"
+	}
 	if boolstr.Type == String {
 		return boolstr.StrVal
 	} else if boolstr.BoolVal {
@@ -69,7 +76,10 @@ func (boolstr *BoolOrString) String() string {
 }
 
 // MarshalJSON implements the json.Marshaller interface.
-func (boolstr BoolOrString) MarshalJSON() ([]byte, error) {
+func (boolstr *BoolOrString) MarshalJSON() ([]byte, error) {
+	if boolstr == nil {
+		return []byte{}, nil
+	}
 	switch boolstr.Type {
 	case Bool:
 		return json.Marshal(boolstr.BoolVal)
@@ -81,7 +91,10 @@ func (boolstr BoolOrString) MarshalJSON() ([]byte, error) {
 }
 
 // MarshalYAML implements the yaml.Marshaller interface https://godoc.org/gopkg.in/yaml.v3#Marshaler
-func (boolstr BoolOrString) MarshalYAML() (interface{}, error) {
+func (boolstr *BoolOrString) MarshalYAML() (interface{}, error) {
+	if boolstr == nil {
+		return []byte{}, nil
+	}
 	switch boolstr.Type {
 	case Bool:
 		return boolstr.BoolVal, nil
@@ -116,3 +129,30 @@ func (boolstr *BoolOrString) Fuzz(c fuzz.Continue) {
 		c.Fuzz(&boolstr.StrVal)
 	}
 }
+
+// BoolOrDefaultFalse returns bool val, if strValu is parsed returns parsed value  else false as default when parse error
+func (boolstr *BoolOrString) BoolOrDefaultFalse() bool {
+	if boolstr == nil {
+		return false
+	}
+	val, err := boolstr.Bool()
+	if err != nil {
+		return false
+	}
+	return val
+}
+
+// Bool returns bool val, if strValu is parsed returns parsed value else false with parse error
+func (boolstr *BoolOrString) Bool() (bool, error) {
+	if boolstr == nil {
+		return false, nil
+	}
+	if boolstr.Type == Bool {
+		return boolstr.BoolVal, nil
+	}
+	parsed, err := strconv.ParseBool(boolstr.StrVal)
+	if err != nil {
+		return false, fmt.Errorf("failed to parse bool string(err: %v)", err)
+	}
+	return parsed, nil
+}

pkg/multitype/boolstring_test.go

@@ -0,0 +1,147 @@
+// Based on https://github.com/kubernetes/apimachinery/blob/455a99f/pkg/util/intstr/intstr.go
+
+package multitype
+
+import (
+	"encoding/json"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"gopkg.in/yaml.v2"
+)
+
+func TestBoolOrString_Bool(t *testing.T) {
+	type fields struct {
+		Type    BoolOrStringType
+		BoolVal bool
+		StrVal  string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		want    bool
+		wantErr bool
+	}{
+		{
+			name:    "expect true when BoolVal is true",
+			fields:  fields{Type: Bool, BoolVal: true},
+			want:    true,
+			wantErr: false,
+		}, {
+			name:    "expect false when BoolVal is false",
+			fields:  fields{Type: Bool, BoolVal: false},
+			want:    false,
+			wantErr: false,
+		}, {
+			name:    "expect false when StrVal is 'false'",
+			fields:  fields{Type: String, StrVal: "false"},
+			want:    false,
+			wantErr: false,
+		}, {
+			name:    "expect true when StrVal is 'true'",
+			fields:  fields{Type: String, StrVal: "true"},
+			want:    true,
+			wantErr: false,
+		}, {
+			name:    "expect false, error when StrVal is ''",
+			fields:  fields{Type: String, StrVal: "''"},
+			want:    false,
+			wantErr: true,
+		},
+		{
+			name:    "expect false, error when StrVal is '123'",
+			fields:  fields{Type: String, StrVal: "123"},
+			want:    false,
+			wantErr: true,
+		}, {
+			name:    "expect true, nil when Type is not specified, StrVal is 'true'",
+			fields:  fields{StrVal: "true"},
+			want:    true,
+			wantErr: false,
+		}, {
+			name:    "expect false, nil when Type is not specified, StrVal is 'false'",
+			fields:  fields{StrVal: "false"},
+			want:    false,
+			wantErr: false,
+		}, {
+			name:    "expect false, nil when Type is not specified, StrVal is 'false' and BoolVal is true",
+			fields:  fields{StrVal: "false", BoolVal: true},
+			want:    false,
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := require.New(t)
+			boolstr := &BoolOrString{
+				Type:    tt.fields.Type,
+				BoolVal: tt.fields.BoolVal,
+				StrVal:  tt.fields.StrVal,
+			}
+			got, err := boolstr.Bool()
+			req.Equal(tt.want, boolstr.BoolOrDefaultFalse())
+			if tt.wantErr {
+				req.Error(err)
+				return
+			}
+			req.NoError(err)
+			req.Equal(tt.want, got)
+		})
+	}
+}
+
+func TestBoolOrString_MarshalOmitempty(t *testing.T) {
+	type S struct {
+		String string        `json:"string,omitempty" yaml:"string,omitempty"`
+		Multi  *BoolOrString `json:"multi,omitempty" yaml:"multi,omitempty"`
+	}
+	tests := []struct {
+		name     string
+		wantJSON string
+		wantYAML string
+	}{
+		{
+			wantJSON: `{"string":"string"}`,
+			wantYAML: "string: string",
+		},
+		{
+			wantJSON: `{"string":"string","multi":false}`,
+			wantYAML: "string: string\nmulti: false",
+		},
+		{
+			wantJSON: `{"string":"string","multi":"false"}`,
+			wantYAML: "string: string\nmulti: \"false\"",
+		},
+		{
+			wantJSON: `{"string":"string","multi":true}`,
+			wantYAML: "string: string\nmulti: true",
+		},
+		{
+			wantJSON: `{"string":"string","multi":"true"}`,
+			wantYAML: "string: string\nmulti: \"true\"",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := require.New(t)
+			ass := require.New(t)
+
+			var sJSON S
+			err := json.Unmarshal([]byte(tt.wantJSON), &sJSON)
+			req.NoError(err)
+
+			out, err := json.Marshal(sJSON)
+			req.NoError(err)
+			ass.Equal(tt.wantJSON, strings.TrimSpace(string(out)))
+
+			var sYAML S
+			err = json.Unmarshal([]byte(tt.wantJSON), &sYAML)
+			req.NoError(err)
+
+			out, err = yaml.Marshal(sYAML)
+			req.NoError(err)
+			ass.Equal(tt.wantYAML, strings.TrimSpace(string(out)))
+		})
+	}
+}

pkg/preflight/analyze.go

@@ -8,6 +8,7 @@ import (
 
 	analyze "github.com/replicatedhq/troubleshoot/pkg/analyze"
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
+	"github.com/replicatedhq/troubleshoot/pkg/logger"
 )
 
 // Analyze runs the analyze phase of preflight checks
@@ -77,8 +78,14 @@ func doAnalyze(allCollectedData map[string][]byte, analyzers []*troubleshootv1be
 	for _, analyzer := range analyzers {
 		analyzeResult, err := analyze.Analyze(analyzer, getCollectedFileContents, getChildCollectedFileContents)
 		if err != nil {
+			strict, strictErr := HasStrictAnalyzer(analyzer)
+			if strictErr != nil {
+				logger.Printf("failed to determine if analyzer %v is strict: %s", analyzer, strictErr)
+			}
+
 			analyzeResult = []*analyze.AnalyzeResult{
 				{
+					Strict:  strict,
 					IsFail:  true,
 					Title:   "Analyzer Failed",
 					Message: err.Error(),

pkg/preflight/collect.go

@@ -87,7 +87,7 @@ func CollectHost(opts CollectOpts, p *troubleshootv1beta2.HostPreflight) (Collec
 
 	var collectors []collect.HostCollector
 	for _, desiredCollector := range collectSpecs {
-		collector, ok := collect.GetHostCollector(desiredCollector)
+		collector, ok := collect.GetHostCollector(desiredCollector, "")
 		if ok {
 			collectors = append(collectors, collector)
 		}

pkg/preflight/types.go

@@ -1,6 +1,7 @@
 package preflight
 
 type UploadPreflightResult struct {
+	Strict bool `json:"strict,omitempty"`
 	IsFail bool `json:"isFail,omitempty"`
 	IsWarn bool `json:"isWarn,omitempty"`
 	IsPass bool `json:"isPass,omitempty"`

pkg/preflight/util.go

@@ -0,0 +1,88 @@
+package preflight
+
+import (
+	"encoding/json"
+
+	"github.com/pkg/errors"
+	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
+)
+
+// HasStrictAnalyzers - checks and returns true if a preflight's analyzer has strict:true, else false
+func HasStrictAnalyzers(preflight *troubleshootv1beta2.Preflight) (bool, error) {
+	if preflight == nil {
+		return false, nil
+	}
+
+	marshalledAnalyzers, err := json.Marshal(preflight.Spec.Analyzers) // marshall and remove nil Analyzers eg result: "[{\"clusterVersion\":{\"exclude\":\"\",\"strict\":\"false\",\"outcomes\":null}}]"
+	if err != nil {
+		return false, errors.Wrap(err, "failed to marshal analyzers")
+	}
+
+	analyzersMap := []map[string]interface{}{}
+	err = json.Unmarshal(marshalledAnalyzers, &analyzersMap) // Unmarshall again so we can loop over non nil analyzers
+	if err != nil {
+		return false, errors.Wrap(err, "failed to unmarshal analyzers")
+	}
+
+	// analyzerMap will ignore empty Analyzers and loop around Analyzer with data
+	for _, analyzers := range analyzersMap { // for each analyzer: map["clusterVersion": map[string]interface{} ["exclude": "", "strict": "true", "outcomes": nil]
+		hasStrictAnalyzer, err := hasStrictAnalyzer(analyzers)
+		if err != nil {
+			return false, errors.Wrap(err, "failed to check if analyzer has strict:true")
+		}
+		if hasStrictAnalyzer {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+
+// HasStrictAnalyzers - checks and returns true if a preflight's analyzer has strict:true, else false
+func HasStrictAnalyzer(analyzer *troubleshootv1beta2.Analyze) (bool, error) {
+	marshalledAnalyzer, err := json.Marshal(analyzer)
+	if err != nil {
+		return false, errors.Wrap(err, "error while marshalling analyzer")
+	}
+
+	analyzerMap := make(map[string]interface{})
+	err = json.Unmarshal(marshalledAnalyzer, &analyzerMap) // Unmarshall again so we can loop over non nil analyzers
+	if err != nil {
+		return false, errors.Wrap(err, "failed to unmarshal analyzers")
+	}
+	return hasStrictAnalyzer(analyzerMap)
+}
+
+func hasStrictAnalyzer(analyzerMap map[string]interface{}) (bool, error) {
+	for _, analyzer := range analyzerMap { // for each analyzerMeta: map[string]interface{} ["exclude": "", "strict": "true", "outcomes": nil]
+		marshalledAnalyzer, err := json.Marshal(analyzer)
+		if err != nil {
+			return false, errors.Wrap(err, "error while marshalling analyzer")
+		}
+		// return Analyzer.Strict which can be extracted from AnalyzeMeta
+		analyzeMeta := troubleshootv1beta2.AnalyzeMeta{}
+		err = json.Unmarshal(marshalledAnalyzer, &analyzeMeta)
+		if err != nil {
+			return false, errors.Wrap(err, "error while un-marshalling marshalledAnalyzers")
+		}
+		if analyzeMeta.Strict.BoolOrDefaultFalse() {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+
+// HasStrictAnalyzersFailed - checks if preflight analyzer's result is strict:true and isFail:true, then returns true else false
+func HasStrictAnalyzersFailed(preflightResult *UploadPreflightResults) bool {
+	hasStrictAnalyzersFailed := false
+	// if results are empty, treat as failure
+	if preflightResult == nil || len(preflightResult.Results) == 0 {
+		hasStrictAnalyzersFailed = true
+	} else {
+		for _, result := range preflightResult.Results {
+			if result.IsFail && result.Strict {
+				hasStrictAnalyzersFailed = true
+			}
+		}
+	}
+	return hasStrictAnalyzersFailed
+}

pkg/preflight/util_test.go

@@ -0,0 +1,384 @@
+package preflight
+
+import (
+	"testing"
+
+	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
+	"github.com/replicatedhq/troubleshoot/pkg/multitype"
+)
+
+var (
+	analyzeMetaStrictFalseStr = troubleshootv1beta2.AnalyzeMeta{
+		Strict: &multitype.BoolOrString{
+			StrVal: "false",
+		},
+	}
+	analyzeMetaStrictInvalidStr = troubleshootv1beta2.AnalyzeMeta{
+		Strict: &multitype.BoolOrString{
+			StrVal: "invalid",
+		},
+	}
+	analyzeMetaStrictTrueStr = troubleshootv1beta2.AnalyzeMeta{
+		Strict: &multitype.BoolOrString{
+			StrVal: "true",
+		},
+	}
+	analyzeMetaStrictFalseBool = troubleshootv1beta2.AnalyzeMeta{
+		Strict: &multitype.BoolOrString{
+			Type:    multitype.Bool,
+			BoolVal: false,
+		},
+	}
+	analyzeMetaStrictTrueBool = troubleshootv1beta2.AnalyzeMeta{
+		Strict: &multitype.BoolOrString{
+			Type:    multitype.Bool,
+			BoolVal: true,
+		},
+	}
+	analyzeMetaStrictFalseInt = troubleshootv1beta2.AnalyzeMeta{
+		Strict: &multitype.BoolOrString{
+			StrVal: "0",
+		},
+	}
+	analyzeMetaStrictTrueInt = troubleshootv1beta2.AnalyzeMeta{
+		Strict: &multitype.BoolOrString{
+			Type:   multitype.String,
+			StrVal: "1",
+		},
+	}
+)
+
+func TestHasStrictAnalyzers(t *testing.T) {
+
+	tests := []struct {
+		name      string
+		preflight *troubleshootv1beta2.Preflight
+		want      bool
+		wantErr   bool
+	}{
+		{
+			name:      "expect false when preflight is nil",
+			preflight: nil,
+			want:      false,
+			wantErr:   false,
+		}, {
+			name: "expect false when preflight spec is empty",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{},
+			},
+			want:    false,
+			wantErr: false,
+		}, {
+			name: "expect false when preflight spec's analyzers is nil",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: nil,
+				},
+			},
+			want:    false,
+			wantErr: false,
+		}, {
+			name: "expect false when preflight spec's analyzers is empty",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{},
+				},
+			},
+			want:    false,
+			wantErr: false,
+		}, {
+			name: "expect false when preflight spec's analyzer has nil analyzer",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{
+						{
+							ClusterVersion: nil,
+						},
+					},
+				},
+			},
+			want:    false,
+			wantErr: false,
+		}, {
+			name: "expect false when preflight spec's analyzer has analyzer with strict str: false",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{
+						{
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictFalseStr},
+						},
+					},
+				},
+			},
+			want:    false,
+			wantErr: false,
+		}, {
+			name: "expect false when preflight spec's analyzer has analyzer with strict bool: false",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{
+						{
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictFalseBool},
+						},
+					},
+				},
+			},
+			want:    false,
+			wantErr: false,
+		}, {
+			name: "expect false when preflight spec's analyzer has analyzer with strict str: invalid",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{
+						{
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictInvalidStr},
+						},
+					},
+				},
+			},
+			want:    false,
+			wantErr: false,
+		}, {
+			name: "expect true when preflight spec's analyzer has analyzer with strict str: true",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{
+						{
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictTrueStr},
+						},
+					},
+				},
+			},
+			want:    true,
+			wantErr: false,
+		}, {
+			name: "expect true when preflight spec's analyzer has analyzer with strict bool: true",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{
+						{
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictTrueBool},
+						},
+					},
+				},
+			},
+			want:    true,
+			wantErr: false,
+		}, {
+			name: "expect true when preflight spec's analyzer has analyzer with strict int: 1",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{
+						{
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictTrueInt},
+						},
+					},
+				},
+			},
+			want:    true,
+			wantErr: false,
+		}, {
+			name: "expect false when preflight spec's analyzer has analyzer with strict int: 0",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{
+						{
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictFalseInt},
+						},
+					},
+				},
+			},
+			want:    false,
+			wantErr: false,
+		}, {
+			name: "expect true when preflight spec's analyzer has analyzer with strict true in one of multiple analyzers",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{
+						{
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictFalseInt},
+						}, {
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictTrueBool},
+						},
+					},
+				},
+			},
+			want:    true,
+			wantErr: false,
+		}, {
+			name: "expect true when preflight spec's analyzer has analyzer with strict true in one of multiple analyzers",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{
+						{
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictFalseInt},
+						}, {
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictTrueBool},
+						}, {
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictInvalidStr},
+						},
+					},
+				},
+			},
+			want:    true,
+			wantErr: false,
+		}, {
+			name: "expect true when preflight spec's analyzer has analyzer with strict true in one of multiple analyzers",
+			preflight: &troubleshootv1beta2.Preflight{
+				Spec: troubleshootv1beta2.PreflightSpec{
+					Analyzers: []*troubleshootv1beta2.Analyze{
+						{
+							ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictFalseInt},
+							StorageClass:   &troubleshootv1beta2.StorageClass{AnalyzeMeta: analyzeMetaStrictFalseInt},
+							Secret:         &troubleshootv1beta2.AnalyzeSecret{AnalyzeMeta: analyzeMetaStrictTrueBool},
+						},
+					},
+				},
+			},
+			want:    true,
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := HasStrictAnalyzers(tt.preflight)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("HasStrictAnalyzers error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("HasStrictAnalyzers() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestHasStrictAnalyzerFailed(t *testing.T) {
+	tests := []struct {
+		name            string
+		preflightResult *UploadPreflightResults
+		want            bool
+	}{
+		{
+			name:            "expect true when preflightResult is nil",
+			preflightResult: nil,
+			want:            true,
+		}, {
+			name: "expect true when preflightResult.Results is nil",
+			preflightResult: &UploadPreflightResults{
+				Results: nil,
+			},
+			want: true,
+		}, {
+			name: "expect true when preflightResult.Results is empty",
+			preflightResult: &UploadPreflightResults{
+				Results: []*UploadPreflightResult{},
+			},
+			want: true,
+		}, {
+			name: "expect false when preflightResult.Results has result with strict false, IsFail false",
+			preflightResult: &UploadPreflightResults{
+				Results: []*UploadPreflightResult{
+					{Strict: false, IsFail: false},
+				},
+			},
+			want: false,
+		}, {
+			name: "expect false when preflightResult.Results has result with strict false, IsFail true",
+			preflightResult: &UploadPreflightResults{
+				Results: []*UploadPreflightResult{
+					{Strict: false, IsFail: true},
+				},
+			},
+			want: false,
+		}, {
+			name: "expect true when preflightResult.Results has result with strict true, IsFail true",
+			preflightResult: &UploadPreflightResults{
+				Results: []*UploadPreflightResult{
+					{Strict: true, IsFail: true},
+				},
+			},
+			want: true,
+		}, {
+			name: "expect true when preflightResult.Results has multiple results where atleast result has strict true, IsFail true",
+			preflightResult: &UploadPreflightResults{
+				Results: []*UploadPreflightResult{
+					{Strict: true, IsFail: true},
+					{Strict: false, IsFail: true},
+					{Strict: true, IsFail: false},
+				},
+			},
+			want: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := HasStrictAnalyzersFailed(tt.preflightResult); got != tt.want {
+				t.Errorf("HasStrictAnalyzersFailed() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestHasStrictAnalyzer(t *testing.T) {
+	tests := []struct {
+		name     string
+		analyzer *troubleshootv1beta2.Analyze
+		want     bool
+		wantErr  bool
+	}{
+		{
+			name:     "expect strict=false, err=nil when analyzer is nil",
+			analyzer: nil,
+			want:     false,
+			wantErr:  false,
+		}, {
+			name:     "expect strict=false, err=nil when analyzer is empty",
+			analyzer: &troubleshootv1beta2.Analyze{},
+			want:     false,
+			wantErr:  false,
+		}, {
+			name: "expect strict=false, err=nil when ClusterVersion analyzer has strict=1",
+			analyzer: &troubleshootv1beta2.Analyze{
+				ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictFalseInt},
+			},
+			want:    false,
+			wantErr: false,
+		}, {
+			name: "expect strict=true, err=nil when ClusterVersion analyzer has strict=true",
+			analyzer: &troubleshootv1beta2.Analyze{
+				ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictTrueInt},
+			},
+			want:    true,
+			wantErr: false,
+		}, {
+			name: "expect strict=false, err=nil when ClusterVersion analyzer is nil",
+			analyzer: &troubleshootv1beta2.Analyze{
+				ClusterVersion: nil,
+			},
+			want:    false,
+			wantErr: false,
+		}, {
+			name: "expect strict=true, err=nil when one of the analyzers has strict=true",
+			analyzer: &troubleshootv1beta2.Analyze{
+				ClusterVersion: &troubleshootv1beta2.ClusterVersion{AnalyzeMeta: analyzeMetaStrictFalseInt},
+				StorageClass:   &troubleshootv1beta2.StorageClass{AnalyzeMeta: analyzeMetaStrictFalseInt},
+				Secret:         &troubleshootv1beta2.AnalyzeSecret{AnalyzeMeta: analyzeMetaStrictTrueBool},
+			},
+			want:    true,
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := HasStrictAnalyzer(tt.analyzer)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("HasStrictAnalyzer() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("HasStrictAnalyzer() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

pkg/supportbundle/collect.go

@@ -20,6 +20,43 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
+func runHostCollectors(opts SupportBundleCreateOpts, hostCollectors []*troubleshootv1beta2.HostCollect, bundlePath string) (collect.CollectorResult, error) {
+	collectSpecs := make([]*troubleshootv1beta2.HostCollect, 0, 0)
+	collectSpecs = append(collectSpecs, hostCollectors...)
+
+	allCollectedData := make(map[string][]byte)
+
+	var collectors []collect.HostCollector
+	for _, desiredCollector := range collectSpecs {
+		collector, ok := collect.GetHostCollector(desiredCollector, bundlePath)
+		if ok {
+			collectors = append(collectors, collector)
+		}
+	}
+
+	collectResult := collect.NewResult()
+
+	for _, collector := range collectors {
+		isExcluded, _ := collector.IsExcluded()
+		if isExcluded {
+			continue
+		}
+
+		opts.ProgressChan <- fmt.Sprintf("[%s] Running collector...", collector.Title())
+		result, err := collector.Collect(opts.ProgressChan)
+		if err != nil {
+			opts.ProgressChan <- errors.Errorf("failed to run collector: %s: %v", collector.Title(), err)
+		}
+		for k, v := range result {
+			allCollectedData[k] = v
+		}
+	}
+
+	collectResult = allCollectedData
+
+	return collectResult, nil
+}
+
 // TODO (dan): This is VERY similar to the Preflight collect package and should be refactored.
 func runCollectors(collectors []*troubleshootv1beta2.Collect, additionalRedactors *troubleshootv1beta2.Redactor, bundlePath string, opts SupportBundleCreateOpts) (collect.CollectorResult, error) {
 

pkg/supportbundle/parse.go

@@ -19,20 +19,44 @@ var (
 	SupportBundleNameRegex = regexp.MustCompile(`^\/?support-bundle-(\d{4})-(\d{2})-(\d{2})T(\d{2})_(\d{2})_(\d{2})\/?`)
 )
 
-func GetPodDetails(bundleArchive string, podNamespace string, podName string) (*types.PodDetails, error) {
-	podDetails := types.PodDetails{}
+func getPodsFilePath(namespace string) string {
+	return filepath.Join("cluster-resources", "pods", fmt.Sprintf("%s.json", namespace))
+}
 
-	nsPodsFilePath := filepath.Join("cluster-resources", "pods", fmt.Sprintf("%s.json", podNamespace))
-	nsEventsFilePath := filepath.Join("cluster-resources", "events", fmt.Sprintf("%s.json", podNamespace))
+func getContainerLogsFilePath(namespace string, podName string, containerName string) string {
+	return filepath.Join("cluster-resources", "pods", "logs", namespace, podName, fmt.Sprintf("%s.log", containerName))
+}
+
+func getEventsFilePath(namespace string) string {
+	return filepath.Join("cluster-resources", "events", fmt.Sprintf("%s.json", namespace))
+}
+
+func GetPodDetails(bundleArchive string, podNamespace string, podName string) (*types.PodDetails, error) {
+	nsPodsFilePath := getPodsFilePath(podNamespace)
+	nsEventsFilePath := getEventsFilePath(podNamespace)
 
 	files, err := GetFilesContents(bundleArchive, []string{nsPodsFilePath, nsEventsFilePath})
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get files contents")
 	}
 
+	return getPodDetailsFromFiles(files, podNamespace, podName)
+}
+
+func getPodDetailsFromFiles(files map[string][]byte, podNamespace string, podName string) (*types.PodDetails, error) {
+	podDetails := types.PodDetails{}
+
+	nsPodsFilePath := getPodsFilePath(podNamespace)
+	nsEventsFilePath := getEventsFilePath(podNamespace)
+
 	var nsEvents []corev1.Event
 	if err := json.Unmarshal(files[nsEventsFilePath], &nsEvents); err != nil {
-		return nil, errors.Wrap(err, "failed to unmarshal events")
+		// try new format
+		var nsEventsList corev1.EventList
+		if err := json.Unmarshal(files[nsEventsFilePath], &nsEventsList); err != nil {
+			return nil, errors.Wrap(err, "failed to unmarshal events")
+		}
+		nsEvents = nsEventsList.Items
 	}
 	podEvents := []corev1.Event{}
 	for _, event := range nsEvents {
@@ -44,7 +68,12 @@ func GetPodDetails(bundleArchive string, podNamespace string, podName string) (*
 
 	var podsArr []corev1.Pod
 	if err := json.Unmarshal(files[nsPodsFilePath], &podsArr); err != nil {
-		return nil, errors.Wrap(err, "failed to unmarshal pods")
+		// try new format
+		var podsList corev1.PodList
+		if err := json.Unmarshal(files[nsPodsFilePath], &podsList); err != nil {
+			return nil, errors.Wrap(err, "failed to unmarshal pods")
+		}
+		podsArr = podsList.Items
 	}
 	for _, pod := range podsArr {
 		if pod.Name == podName && pod.Namespace == podNamespace {
@@ -53,14 +82,14 @@ func GetPodDetails(bundleArchive string, podNamespace string, podName string) (*
 			for _, i := range pod.Spec.InitContainers {
 				podDetails.PodContainers = append(podDetails.PodContainers, types.PodContainer{
 					Name:            i.Name,
-					LogsFilePath:    filepath.Join("cluster-resources", "pods", "logs", pod.Namespace, pod.Name, fmt.Sprintf("%s.log", i.Name)),
+					LogsFilePath:    getContainerLogsFilePath(pod.Namespace, pod.Name, i.Name),
 					IsInitContainer: true,
 				})
 			}
 			for _, c := range pod.Spec.Containers {
 				podDetails.PodContainers = append(podDetails.PodContainers, types.PodContainer{
 					Name:            c.Name,
-					LogsFilePath:    filepath.Join("cluster-resources", "pods", "logs", pod.Namespace, pod.Name, fmt.Sprintf("%s.log", c.Name)),
+					LogsFilePath:    getContainerLogsFilePath(pod.Namespace, pod.Name, c.Name),
 					IsInitContainer: false,
 				})
 			}

pkg/supportbundle/parse_test.go

@@ -0,0 +1,230 @@
+package supportbundle
+
+import (
+	"fmt"
+	"testing"
+
+	types "github.com/replicatedhq/troubleshoot/pkg/supportbundle/types"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func Test_getPodDetails(t *testing.T) {
+	podNamespace := "default"
+	podName := "hello-27436131-pxhk9"
+
+	podsFileContentOldFormat := `[
+		{
+			"kind": "Pod",
+			"apiVersion": "v1",
+			"metadata": {
+				"name": "hello-27436131-pxhk9",
+				"namespace": "default"
+			},
+			"spec": {
+				"initContainers": [
+					{
+						"name": "remove-lost-found"
+					}
+				],
+				"containers": [
+					{
+						"name": "hello"
+					}
+				]
+			}
+		}
+	]`
+
+	podsFileContentNewFormat := fmt.Sprintf(`{
+		"kind": "PodList",
+		"apiVersion": "v1",
+		"metadata": {
+			"resourceVersion": "5389414"
+		},
+		"items": %s
+	}`, podsFileContentOldFormat)
+
+	eventsFileContentOldFormat := `[
+		{
+			"kind": "Event",
+			"apiVersion": "v1",
+			"metadata": {
+				"name": "example-nginx.16d85cebe302a9b1",
+				"namespace": "default"
+			},
+			"involvedObject": {
+				"kind": "Deployment",
+				"namespace": "default",
+				"name": "example-nginx"
+			}
+		},
+		{
+			"kind": "Event",
+			"apiVersion": "v1",
+			"metadata": {
+				"name": "hello-27436131-pxhk9.16d85cf27380b4fa",
+				"namespace": "default"
+			},
+			"involvedObject": {
+				"kind": "Pod",
+				"namespace": "default",
+				"name": "hello-27436131-pxhk9"
+			}
+		}
+	]`
+
+	eventsFileContentNewFormat := fmt.Sprintf(`{
+		"kind": "EventList",
+		"apiVersion": "v1",
+		"metadata": {
+			"resourceVersion": "5389515"
+		},
+		"items": %s
+	}`, eventsFileContentOldFormat)
+
+	removeLostAndFoundInitContainerLogs := `some logs here`
+	helloContainerLogs := `Tue Mar 1 20:53:00 UTC 2022 Hello`
+
+	tests := []struct {
+		name   string
+		files  map[string][]byte
+		expect *types.PodDetails
+	}{
+		{
+			name: "old support bundle format",
+			files: map[string][]byte{
+				getPodsFilePath(podNamespace):                                        []byte(podsFileContentOldFormat),
+				getEventsFilePath(podNamespace):                                      []byte(eventsFileContentOldFormat),
+				getContainerLogsFilePath(podNamespace, podName, "remove-lost-found"): []byte(removeLostAndFoundInitContainerLogs),
+				getContainerLogsFilePath(podNamespace, podName, "hello"):             []byte(helloContainerLogs),
+			},
+			expect: &types.PodDetails{
+				PodDefinition: corev1.Pod{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Pod",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      podName,
+						Namespace: podNamespace,
+					},
+					Spec: corev1.PodSpec{
+						InitContainers: []corev1.Container{
+							{
+								Name: "remove-lost-found",
+							},
+						},
+						Containers: []corev1.Container{
+							{
+								Name: "hello",
+							},
+						},
+					},
+				},
+				PodEvents: []corev1.Event{
+					{
+						TypeMeta: metav1.TypeMeta{
+							APIVersion: "v1",
+							Kind:       "Event",
+						},
+						ObjectMeta: metav1.ObjectMeta{
+							Name:      "hello-27436131-pxhk9.16d85cf27380b4fa",
+							Namespace: podNamespace,
+						},
+						InvolvedObject: corev1.ObjectReference{
+							Kind:      "Pod",
+							Namespace: podNamespace,
+							Name:      podName,
+						},
+					},
+				},
+				PodContainers: []types.PodContainer{
+					{
+						Name:            "remove-lost-found",
+						LogsFilePath:    getContainerLogsFilePath(podNamespace, podName, "remove-lost-found"),
+						IsInitContainer: true,
+					},
+					{
+						Name:         "hello",
+						LogsFilePath: getContainerLogsFilePath(podNamespace, podName, "hello"),
+					},
+				},
+			},
+		},
+		{
+			name: "new support bundle format",
+			files: map[string][]byte{
+				getPodsFilePath(podNamespace):                                        []byte(podsFileContentNewFormat),
+				getEventsFilePath(podNamespace):                                      []byte(eventsFileContentNewFormat),
+				getContainerLogsFilePath(podNamespace, podName, "remove-lost-found"): []byte(removeLostAndFoundInitContainerLogs),
+				getContainerLogsFilePath(podNamespace, podName, "hello"):             []byte(helloContainerLogs),
+			},
+			expect: &types.PodDetails{
+				PodDefinition: corev1.Pod{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Pod",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      podName,
+						Namespace: podNamespace,
+					},
+					Spec: corev1.PodSpec{
+						InitContainers: []corev1.Container{
+							{
+								Name: "remove-lost-found",
+							},
+						},
+						Containers: []corev1.Container{
+							{
+								Name: "hello",
+							},
+						},
+					},
+				},
+				PodEvents: []corev1.Event{
+					{
+						TypeMeta: metav1.TypeMeta{
+							APIVersion: "v1",
+							Kind:       "Event",
+						},
+						ObjectMeta: metav1.ObjectMeta{
+							Name:      "hello-27436131-pxhk9.16d85cf27380b4fa",
+							Namespace: podNamespace,
+						},
+						InvolvedObject: corev1.ObjectReference{
+							Kind:      "Pod",
+							Namespace: podNamespace,
+							Name:      podName,
+						},
+					},
+				},
+				PodContainers: []types.PodContainer{
+					{
+						Name:            "remove-lost-found",
+						LogsFilePath:    getContainerLogsFilePath(podNamespace, podName, "remove-lost-found"),
+						IsInitContainer: true,
+					},
+					{
+						Name:         "hello",
+						LogsFilePath: getContainerLogsFilePath(podNamespace, podName, "hello"),
+					},
+				},
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			req := require.New(t)
+
+			actual, err := getPodDetailsFromFiles(test.files, podNamespace, podName)
+			req.NoError(err)
+
+			assert.Equal(t, test.expect, actual)
+		})
+	}
+}

pkg/supportbundle/supportbundle.go

@@ -86,12 +86,21 @@ func CollectSupportBundleFromSpec(spec *troubleshootv1beta2.SupportBundleSpec, a
 		return nil, errors.Wrap(err, "create bundle dir")
 	}
 
+	hostFiles, err := runHostCollectors(opts, spec.HostCollectors, bundlePath)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to run host collectors")
+	}
+
 	// Run collectors
 	files, err := runCollectors(spec.Collectors, additionalRedactors, bundlePath, opts)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to run collectors")
 	}
 
+	for k, v := range hostFiles {
+		files[k] = v
+	}
+
 	version, err := getVersionFile()
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get version file")

schemas/analyzer-troubleshoot-v1beta2.json

@@ -90,13 +90,15 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
               "clusterPodStatuses": {
                 "type": "object",
                 "required": [
-                  "namespaces",
                   "outcomes"
                 ],
                 "properties": {
@@ -161,6 +163,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -225,6 +230,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -300,6 +308,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -364,6 +375,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -432,6 +446,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -439,7 +456,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes"
                 ],
                 "properties": {
@@ -455,6 +471,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -504,6 +526,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -568,6 +593,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -636,6 +664,9 @@
                   },
                   "registryName": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -708,6 +739,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -715,7 +749,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes"
                 ],
                 "properties": {
@@ -731,6 +764,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -780,6 +819,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -851,6 +893,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -922,6 +967,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1026,6 +1074,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1097,6 +1148,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1168,6 +1222,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1236,6 +1293,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1243,7 +1303,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes",
                   "selector"
                 ],
@@ -1260,6 +1319,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -1315,6 +1380,9 @@
                     "items": {
                       "type": "string"
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1390,6 +1458,9 @@
                   },
                   "secretName": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1397,7 +1468,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes"
                 ],
                 "properties": {
@@ -1413,6 +1483,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -1462,6 +1538,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1530,6 +1609,9 @@
                   },
                   "storageClassName": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1594,6 +1676,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1673,6 +1758,9 @@
                   },
                   "regexGroups": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1690,6 +1778,9 @@
                   },
                   "reportFileGlob": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               }

schemas/preflight-troubleshoot-v1beta2.json

@@ -90,13 +90,15 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
               "clusterPodStatuses": {
                 "type": "object",
                 "required": [
-                  "namespaces",
                   "outcomes"
                 ],
                 "properties": {
@@ -161,6 +163,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -225,6 +230,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -300,6 +308,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -364,6 +375,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -432,6 +446,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -439,7 +456,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes"
                 ],
                 "properties": {
@@ -455,6 +471,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -504,6 +526,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -568,6 +593,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -636,6 +664,9 @@
                   },
                   "registryName": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -708,6 +739,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -715,7 +749,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes"
                 ],
                 "properties": {
@@ -731,6 +764,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -780,6 +819,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -851,6 +893,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -922,6 +967,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1026,6 +1074,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1097,6 +1148,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1168,6 +1222,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1236,6 +1293,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1243,7 +1303,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes",
                   "selector"
                 ],
@@ -1260,6 +1319,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -1315,6 +1380,9 @@
                     "items": {
                       "type": "string"
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1390,6 +1458,9 @@
                   },
                   "secretName": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1397,7 +1468,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes"
                 ],
                 "properties": {
@@ -1413,6 +1483,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -1462,6 +1538,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1530,6 +1609,9 @@
                   },
                   "storageClassName": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1594,6 +1676,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1673,6 +1758,9 @@
                   },
                   "regexGroups": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1690,6 +1778,9 @@
                   },
                   "reportFileGlob": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               }

schemas/supportbundle-troubleshoot-v1beta2.json

@@ -136,13 +136,15 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
               "clusterPodStatuses": {
                 "type": "object",
                 "required": [
-                  "namespaces",
                   "outcomes"
                 ],
                 "properties": {
@@ -207,6 +209,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -271,6 +276,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -346,6 +354,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -410,6 +421,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -478,6 +492,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -485,7 +502,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes"
                 ],
                 "properties": {
@@ -501,6 +517,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -550,6 +572,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -614,6 +639,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -682,6 +710,9 @@
                   },
                   "registryName": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -754,6 +785,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -761,7 +795,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes"
                 ],
                 "properties": {
@@ -777,6 +810,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -826,6 +865,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -897,6 +939,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -968,6 +1013,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1072,6 +1120,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1143,6 +1194,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1214,6 +1268,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1282,6 +1339,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1289,7 +1349,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes",
                   "selector"
                 ],
@@ -1306,6 +1365,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -1361,6 +1426,9 @@
                     "items": {
                       "type": "string"
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1436,6 +1504,9 @@
                   },
                   "secretName": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1443,7 +1514,6 @@
                 "type": "object",
                 "required": [
                   "name",
-                  "namespace",
                   "outcomes"
                 ],
                 "properties": {
@@ -1459,6 +1529,12 @@
                   "namespace": {
                     "type": "string"
                   },
+                  "namespaces": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "outcomes": {
                     "type": "array",
                     "items": {
@@ -1508,6 +1584,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1576,6 +1655,9 @@
                   },
                   "storageClassName": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1640,6 +1722,9 @@
                         }
                       }
                     }
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1719,6 +1804,9 @@
                   },
                   "regexGroups": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               },
@@ -1736,6 +1824,9 @@
                   },
                   "reportFileGlob": {
                     "type": "string"
+                  },
+                  "strict": {
+                    "oneOf": [{"type": "string"},{"type": "boolean"}]
                   }
                 }
               }