From de9f82124595d46f0d527cf05e8b37769e2cfba2 Mon Sep 17 00:00:00 2001 From: derailed Date: Mon, 19 Feb 2024 09:31:00 -0700 Subject: [PATCH 1/2] log server info err --- internal/dag/cluster.go | 1 - internal/scrub/cluster.go | 3 ++- pkg/popeye.go | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/dag/cluster.go b/internal/dag/cluster.go index dfc8b07b..c97649e8 100644 --- a/internal/dag/cluster.go +++ b/internal/dag/cluster.go @@ -20,7 +20,6 @@ func ListVersion(ctx context.Context) (*semver.Version, error) { if err != nil { return nil, err } - rev, err := semver.NewVersion(info.Major + "." + info.Minor) if err != nil { return nil, err diff --git a/internal/scrub/cluster.go b/internal/scrub/cluster.go index 0fb80884..391cec44 100644 --- a/internal/scrub/cluster.go +++ b/internal/scrub/cluster.go @@ -11,6 +11,7 @@ import ( "github.com/derailed/popeye/internal/lint" "github.com/derailed/popeye/pkg/config" "github.com/derailed/popeye/types" + "github.com/rs/zerolog/log" ) // Cluster represents a Cluster scruber. @@ -33,7 +34,7 @@ func NewCluster(ctx context.Context, c *Cache, codes *issues.Codes) Linter { var err error cl.Cluster, err = c.cluster(ctx) if err != nil { - cl.AddErr(ctx, err) + log.Error().Err(err).Msgf("Unable to gather cluster info") } return &cl diff --git a/pkg/popeye.go b/pkg/popeye.go index 19efbeb4..ebec01fd 100644 --- a/pkg/popeye.go +++ b/pkg/popeye.go @@ -147,7 +147,7 @@ func (p *Popeye) initFactory() error { } ok, err := clt.CanI(client.AllNamespaces, gvr, types.ReadAllAccess...) if !ok || err != nil { - return fmt.Errorf("Current user does not have read access for resource %q -- %w", gvr, err) + return fmt.Errorf("current user does not have read access for resource %q -- %w", gvr, err) } if _, err := f.ForResource(client.AllNamespaces, gvr); err != nil { return err @@ -187,9 +187,6 @@ func (p *Popeye) Lint() (int, int, error) { } log.Debug().Msgf("Score [%d]", score) - if config.IsStrSet(p.flags.S3.Bucket) { - } - return errCount, score, p.dump(true, p.flags.Exhaust()) } From c04795ae71112ba4ab79158d6884435dbd398669 Mon Sep 17 00:00:00 2001 From: derailed Date: Mon, 19 Feb 2024 09:34:00 -0700 Subject: [PATCH 2/2] release v0.20.1 --- Makefile | 2 +- change_logs/release_v0.20.1.md | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 change_logs/release_v0.20.1.md diff --git a/Makefile b/Makefile index bd7f1941..af1cbbb3 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NAME := popeye PACKAGE := github.com/derailed/$(NAME) -VERSION := v0.20.0 +VERSION := v0.20.1 GIT := $(shell git rev-parse --short HEAD) DATE := $(shell date +%FT%T%Z) IMG_NAME := derailed/popeye diff --git a/change_logs/release_v0.20.1.md b/change_logs/release_v0.20.1.md new file mode 100644 index 00000000..0a7676b3 --- /dev/null +++ b/change_logs/release_v0.20.1.md @@ -0,0 +1,19 @@ + + +# Release v0.20.1 + +## Notes + +Thank you to all that contributed with flushing out issues and enhancements for Popeye! I'll try to mark some of these issues as fixed. But if you don't mind grab the latest rev and see if we're happier with some of the fixes! If you've filed an issue please help me verify and close. Your support, kindness and awesome suggestions to make Popeye better is as ever very much noticed and appreciated! + +This project offers a GitHub Sponsor button (over here 👆). As you well know this is not pimped out by big corps with deep pockets. If you feel `Popeye` is saving you cycles diagnosing potential cluster issues please consider sponsoring this project!! It does go a long way in keeping our servers lights on and beers in our fridge. + +Also if you dig this tool, please make some noise on social! [@kitesurfer](https://twitter.com/kitesurfer) + +--- + +## Patch Release + +--- + +  © 2024 Imhotep Software LLC. All materials licensed under [Apache v2.0](http://www.apache.org/licenses/LICENSE-2.0)