mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-10-09 22:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: update the way results are retrieved for certified conformance

Browse Source 
Looks like we bumped sonobuoy library, and it silently changed a lot of
things in the way it works with the results.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
This commit is contained in:
Andrey Smirnov 2021-09-13 21:05:02 +03:00
parent a059454045
commit a1c9d64907
No known key found for this signature in database
GPG Key ID: 7B26396447AB6DFD
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/cluster/sonobuoy/sonobuoy.go
View File

@ -248,7 +248,14 @@ func Run(ctx context.Context, cluster cluster.K8sProvider, options *Options) err
return fmt.Errorf("no result reader") return fmt.Errorf("no result reader")
} }
tarR := tar.NewReader(resultR) gzipR, err := gzip.NewReader(resultR)
if err != nil {
return err
}
defer gzipR.Close() //nolint:errcheck
tarR := tar.NewReader(gzipR)
for { for {
var header *tar.Header var header *tar.Header
@ -262,22 +269,22 @@ func Run(ctx context.Context, cluster cluster.K8sProvider, options *Options) err
return err return err
} }
matched, _ := filepath.Match("tmp/sonobuoy/*_sonobuoy_*.tar.gz", header.Name) //nolint:errcheck matched, _ := filepath.Match("*_sonobuoy_*.tar.gz", header.Name) //nolint:errcheck
if !matched { if !matched {
continue continue
} }
var gzipR *gzip.Reader var innerGzipR *gzip.Reader
gzipR, err = gzip.NewReader(tarR) innerGzipR, err = gzip.NewReader(tarR)
if err != nil { if err != nil {
return err return err
} }
defer gzipR.Close() //nolint:errcheck defer innerGzipR.Close() //nolint:errcheck
innnerTarR := tar.NewReader(gzipR) innnerTarR := tar.NewReader(innerGzipR)
for { for {
header, err = innnerTarR.Next() header, err = innnerTarR.Next()
@ -315,7 +322,9 @@ func Run(ctx context.Context, cluster cluster.K8sProvider, options *Options) err
select { select {
case err = <-errCh: case err = <-errCh:
return err if err != nil {
return err
}
default: default:
} }