From 5a8f8147447cba1130a3061d9bb65ce3ed058495 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 11:06:36 +0200 Subject: [PATCH 1/5] chore(deps): bump google.golang.org/grpc from 1.64.0 to 1.64.1 (#806) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.64.0 to 1.64.1. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.64.0...v1.64.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index de5fb9a0f..c1950e882 100644 --- a/go.mod +++ b/go.mod @@ -427,7 +427,7 @@ require ( google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240515191416-fc5f0ca64291 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/grpc v1.64.1 // indirect google.golang.org/protobuf v1.34.1 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/evanphx/json-patch.v5 v5.8.1 // indirect diff --git a/go.sum b/go.sum index bb1087c49..e1c2572a6 100644 --- a/go.sum +++ b/go.sum @@ -1325,8 +1325,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= +google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= 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= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 300417d9530c6ca610840e5935333957cf92eed3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 13:27:31 +0200 Subject: [PATCH 2/5] chore(deps): bump docker/setup-buildx-action from 3.3.0 to 3.4.0 (#809) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/d70bba72b1f3fd22344832f00baa16ece964efeb...4fd812986e6c8c2a69e18311145f9371337f27d4) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 46fdefe35..911faaab3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -28,7 +28,7 @@ jobs: # Workaround: https://github.com/docker/build-push-action/issues/461 - name: Setup Docker buildx - uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb + uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # Login against a Docker registry except on PR # https://github.com/docker/login-action From 67d89dd3d33c60410d3746e171e68b013d93b878 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 13:30:21 +0200 Subject: [PATCH 3/5] chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring (#807) Bumps [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator) from 0.75.0 to 0.75.1. - [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases) - [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus-operator/prometheus-operator/compare/v0.75.0...v0.75.1) --- updated-dependencies: - dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c1950e882..63ba6b333 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/openshift/api v0.0.0-20230406152840-ce21e3fe5da2 github.com/owenrumney/go-sarif/v2 v2.3.1 github.com/pkg/errors v0.9.1 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.1 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 diff --git a/go.sum b/go.sum index e1c2572a6..bdb656ec6 100644 --- a/go.sum +++ b/go.sum @@ -855,8 +855,8 @@ github.com/polyfloyd/go-errorlint v1.5.2 h1:SJhVik3Umsjh7mte1vE0fVZ5T1gznasQG3PV github.com/polyfloyd/go-errorlint v1.5.2/go.mod h1:sH1QC1pxxi0fFecsVIzBmxtrgd9IF/SkJpA6wqyKAJs= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.0 h1:62MgqpTrtjNd8cc0RJSFJ1OHqgSrThgHehGVuQaF/fc= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.0/go.mod h1:XYrdZw5dW12Cjkt4ndbeNZZTBp4UCHtW0ccR9+sTtPU= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.1 h1:+iiljhJV6niK7MuifJs/n3NeLxikd85nrQfn53sLJkU= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.1/go.mod h1:XYrdZw5dW12Cjkt4ndbeNZZTBp4UCHtW0ccR9+sTtPU= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= 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= From 0dcb6924908506877123fbc7005b68af4c32aa9a Mon Sep 17 00:00:00 2001 From: dhaus67 Date: Mon, 15 Jul 2024 16:55:49 +0200 Subject: [PATCH 4/5] chore: remove deprecated configs in golang-ci lint (#812) --- .golangci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 1343ab8de..f86aa83fc 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,5 +1,6 @@ run: timeout: 5m + go: "1.22" issues: exclude-use-default: false @@ -45,23 +46,19 @@ linters-settings: excludes: - G101 gosimple: - go: "1.16" checks: ["all"] nolintlint: - allow-leading-space: false # require machine-readable nolint directives (i.e. with no leading space) allow-unused: false # report any unused nolint directives require-explanation: false # don't require an explanation for nolint directives require-specific: true # require nolint directives to be specific about which linter is being skipped revive: - min-confidence: 0 + confidence: 0 # Due to https://github.com/golangci/golangci-lint/issues/2355 on MacOS the linter is failing with the error # message too many files. Set the max-open-files explicitly. max-open-files: 2048 staticcheck: - go: "1.16" checks: ["all"] stylecheck: - go: "1.16" checks: ["all", "-ST1000"] linters: From 90d63af1ad301538f7d44ee356935a464b8f7a40 Mon Sep 17 00:00:00 2001 From: Tomasz Janiszewski Date: Mon, 15 Jul 2024 17:02:43 +0200 Subject: [PATCH 5/5] fix: remove darwin shell hack in Makefile (#810) Signed-off-by: Tomasz Janiszewski Co-authored-by: Raad Haddad --- Makefile | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 373296fca..c074b1f26 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,4 @@ - -.PHONY: none -none: - - +.PHONY: deps deps: go.mod go.sum @echo "+ $@" @go mod tidy @@ -22,12 +18,6 @@ GOBIN := $(CURDIR)/.gobin DIST := $(CURDIR)/dist PATH := $(DIST):$(GOBIN):$(PATH) -# Makefile on Mac doesn't pass the updated PATH and GOBIN to the shell -# and so, without the following line, the shell does not end up -# trying commands in $(GOBIN) first. -# See https://stackoverflow.com/a/36226784/3690207 -SHELL := env GOBIN=$(GOBIN) PATH=$(PATH) /bin/bash - KUBE_LINTER_BIN := $(GOBIN)/kube-linter COVFILES := $(shell mktemp -d) @@ -39,12 +29,12 @@ COVFILES := $(shell mktemp -d) GOLANGCILINT_BIN := $(GOBIN)/golangci-lint $(GOLANGCILINT_BIN): deps @echo "+ $@" - go install github.com/golangci/golangci-lint/cmd/golangci-lint + GOBIN=$(GOBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint GORELEASER_BIN := $(GOBIN)/goreleaser $(GORELEASER_BIN): deps @echo "+ $@" - go install github.com/goreleaser/goreleaser + GOBIN=$(GOBIN) go install github.com/goreleaser/goreleaser ########### ## Lint ## @@ -56,9 +46,9 @@ ifdef CI @echo '+ $@' @echo 'The environment indicates we are in CI; running linters in check mode.' @echo 'If this fails, run `make lint`.' - golangci-lint run + $(GOLANGCILINT_BIN) run else - golangci-lint run --fix + $(GOLANGCILINT_BIN) run --fix endif .PHONY: lint @@ -89,7 +79,8 @@ generated-srcs: go-generated-srcs generated-docs build: $(KUBE_LINTER_BIN) $(KUBE_LINTER_BIN): $(GORELEASER_BIN) $(shell find . -type f -name '*.go') - goreleaser build --snapshot --clean + $(GORELEASER_BIN) build --snapshot --clean + mkdir -p $(GOBIN) @cp "$(DIST)/kube-linter_$(HOST_OS)_amd64_v1/kube-linter" "$(GOBIN)/kube-linter" @chmod u+w "$(GOBIN)/kube-linter"