Skip to content

Commit 759d2d1

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #597 from pedjak/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents cde7bf0 + 9fbe333 commit 759d2d1

File tree

540 files changed

+46776
-12670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

540 files changed

+46776
-12670
lines changed

‎.bingo/Variables.mk‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,17 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
2323
@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
2424
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
2525

26-
CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.19.0
26+
CONFTEST := $(GOBIN)/conftest-v0.62.0
27+
$(CONFTEST): $(BINGO_DIR)/conftest.mod
28+
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
29+
@echo "(re)installing $(GOBIN)/conftest-v0.62.0"
30+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=conftest.mod -o=$(GOBIN)/conftest-v0.62.0 "github.com/open-policy-agent/conftest"
31+
32+
CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.20.0
2733
$(CONTROLLER_GEN): $(BINGO_DIR)/controller-gen.mod
2834
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
29-
@echo "(re)installing $(GOBIN)/controller-gen-v0.19.0"
30-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.19.0 "sigs.k8s.io/controller-tools/cmd/controller-gen"
35+
@echo "(re)installing $(GOBIN)/controller-gen-v0.20.0"
36+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.20.0 "sigs.k8s.io/controller-tools/cmd/controller-gen"
3137

3238
CRD_DIFF := $(GOBIN)/crd-diff-v0.5.0
3339
$(CRD_DIFF): $(BINGO_DIR)/crd-diff.mod
@@ -47,29 +53,35 @@ $(GOJQ): $(BINGO_DIR)/gojq.mod
4753
@echo "(re)installing $(GOBIN)/gojq-v0.12.17"
4854
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gojq.mod -o=$(GOBIN)/gojq-v0.12.17 "github.com/itchyny/gojq/cmd/gojq"
4955

50-
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.6.2
56+
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.7.2
5157
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
5258
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
53-
@echo "(re)installing $(GOBIN)/golangci-lint-v2.6.2"
54-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.6.2 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
59+
@echo "(re)installing $(GOBIN)/golangci-lint-v2.7.2"
60+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.7.2 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
5561

56-
GORELEASER := $(GOBIN)/goreleaser-v1.26.2
62+
GORELEASER := $(GOBIN)/goreleaser-v2.11.2
5763
$(GORELEASER): $(BINGO_DIR)/goreleaser.mod
5864
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
59-
@echo "(re)installing $(GOBIN)/goreleaser-v1.26.2"
60-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goreleaser.mod -o=$(GOBIN)/goreleaser-v1.26.2 "github.com/goreleaser/goreleaser"
65+
@echo "(re)installing $(GOBIN)/goreleaser-v2.11.2"
66+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goreleaser.mod -o=$(GOBIN)/goreleaser-v2.11.2 "github.com/goreleaser/goreleaser/v2"
6167

6268
HELM := $(GOBIN)/helm-v3.18.4
6369
$(HELM): $(BINGO_DIR)/helm.mod
6470
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
6571
@echo "(re)installing $(GOBIN)/helm-v3.18.4"
6672
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=helm.mod -o=$(GOBIN)/helm-v3.18.4 "helm.sh/helm/v3/cmd/helm"
6773

68-
KIND := $(GOBIN)/kind-v0.30.0
74+
KIND := $(GOBIN)/kind-v0.31.0
6975
$(KIND): $(BINGO_DIR)/kind.mod
7076
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
71-
@echo "(re)installing $(GOBIN)/kind-v0.30.0"
72-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.30.0 "sigs.k8s.io/kind"
77+
@echo "(re)installing $(GOBIN)/kind-v0.31.0"
78+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.31.0 "sigs.k8s.io/kind"
79+
80+
KUBE_SCORE := $(GOBIN)/kube-score-v1.20.0
81+
$(KUBE_SCORE): $(BINGO_DIR)/kube-score.mod
82+
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
83+
@echo "(re)installing $(GOBIN)/kube-score-v1.20.0"
84+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kube-score.mod -o=$(GOBIN)/kube-score-v1.20.0 "github.com/zegl/kube-score/cmd/kube-score"
7385

7486
KUSTOMIZE := $(GOBIN)/kustomize-v5.7.1
7587
$(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod

‎.bingo/conftest.mod‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
2+
3+
go 1.24.6
4+
5+
require github.com/open-policy-agent/conftest v0.62.0

0 commit comments

Comments
 (0)