Skip to content

Commit 30b2b20

Browse files
authored
Merge pull request #1873 from rabbitmq/move-tools
Track tools using `tool` directive
2 parents 14d25ec + b63e5db commit 30b2b20

File tree

8 files changed

+944
-547
lines changed

8 files changed

+944
-547
lines changed

Makefile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -214,21 +214,16 @@ docker-build-dev:
214214

215215
# https://github.com/cert-manager/cmctl/releases
216216
# Cert Manager now publishes CMCTL independently from cert-manager
217-
CMCTL_VERSION ?= v2.1.0
218-
CMCTL = $(LOCAL_TESTBIN)/cmctl
219217
.PHONY: cmctl
220-
cmctl: | $(CMCTL)
221-
$(CMCTL): | $(LOCAL_TMP) $(LOCAL_TESTBIN)
222-
curl -sSL -o $(LOCAL_TMP)/cmctl.tar.gz https://github.com/cert-manager/cmctl/releases/download/$(CMCTL_VERSION)/cmctl_$(platform)_$(shell go env GOARCH).tar.gz
223-
tar -C $(LOCAL_TMP) -xzf $(LOCAL_TMP)/cmctl.tar.gz
224-
mv $(LOCAL_TMP)/cmctl $(CMCTL)
218+
cmctl:
219+
cd internal/tools; go install github.com/cert-manager/cmctl/v2
225220

226221
CERT_MANAGER_VERSION ?= 1.15.1
227222
.PHONY: cert-manager
228-
cert-manager: | $(CMCTL) ## Setup cert-manager. Use CERT_MANAGER_VERSION to customise the version e.g. CERT_MANAGER_VERSION="1.9.2"
223+
cert-manager: cmctl ## Setup cert-manager. Use CERT_MANAGER_VERSION to customise the version e.g. CERT_MANAGER_VERSION="1.9.2"
229224
@echo "Installing Cert Manager"
230225
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v$(CERT_MANAGER_VERSION)/cert-manager.yaml
231-
$(CMCTL) check api --wait=5m --namespace cert-manager
226+
cmctl check api --wait=5m --namespace cert-manager
232227

233228
.PHONY: cert-manager-rm
234229
cert-manager-rm:
@@ -259,4 +254,5 @@ docker-registry-secret:
259254

260255
.PHONY: install-tools
261256
install-tools:
262-
cd internal/tools; grep _ tools.go | awk -F '"' '{print $$2}' | xargs -t go install -mod=mod
257+
go install tool
258+
cd internal/tools; go install tool; go tool

config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apiVersion: apiextensions.k8s.io/v1
1010
kind: CustomResourceDefinition
1111
metadata:
1212
annotations:
13-
controller-gen.kubebuilder.io/version: v0.17.3
13+
controller-gen.kubebuilder.io/version: v0.18.0
1414
name: rabbitmqclusters.rabbitmq.com
1515
spec:
1616
group: rabbitmq.com

docs/api/rabbitmq.com.ref.asciidoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ The purpose of this artificial delay is to ensure that DNS entries are up-to-dat
392392
For more information, see https://github.com/kubernetes/kubernetes/issues/92559
393393
If your Kubernetes DNS backend is configured with a low DNS cache value or publishes not ready addresses
394394
promptly, you can decrase this value or set it to 0.
395-
(Default `30` seconds)
396395
| *`secretBackend`* __xref:{anchor_prefix}-github-com-rabbitmq-cluster-operator-v2-api-v1beta1-secretbackend[$$SecretBackend$$]__ | Secret backend configuration for the RabbitmqCluster.
397396
Enables to fetch default user credentials and certificates from K8s external secret stores.
398397
|===

go.mod

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,66 +27,191 @@ require (
2727
)
2828

2929
require (
30+
cloud.google.com/go/auth v0.15.0 // indirect
31+
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
32+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
33+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
34+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect
35+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
36+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0 // indirect
37+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect
38+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
39+
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 // indirect
40+
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
41+
github.com/Microsoft/go-winio v0.6.1 // indirect
42+
github.com/alecthomas/kingpin/v2 v2.4.0 // indirect
43+
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
44+
github.com/armon/go-metrics v0.4.1 // indirect
45+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
46+
github.com/aws/aws-sdk-go v1.55.6 // indirect
47+
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
3048
github.com/beorn7/perks v1.0.1 // indirect
3149
github.com/cespare/xxhash/v2 v2.3.0 // indirect
50+
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 // indirect
51+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3252
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
53+
github.com/dennwc/varint v1.0.0 // indirect
54+
github.com/digitalocean/godo v1.136.0 // indirect
55+
github.com/distribution/reference v0.5.0 // indirect
56+
github.com/docker/docker v28.0.1+incompatible // indirect
57+
github.com/docker/go-connections v0.4.0 // indirect
58+
github.com/docker/go-units v0.5.0 // indirect
59+
github.com/edsrzf/mmap-go v1.2.0 // indirect
3360
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
61+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
62+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
3463
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
3564
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
65+
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
66+
github.com/fatih/color v1.16.0 // indirect
67+
github.com/felixge/httpsnoop v1.0.4 // indirect
3668
github.com/fsnotify/fsnotify v1.9.0 // indirect
3769
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
70+
github.com/go-logr/stdr v1.2.2 // indirect
3871
github.com/go-logr/zapr v1.3.0 // indirect
72+
github.com/go-openapi/analysis v0.23.0 // indirect
73+
github.com/go-openapi/errors v0.22.0 // indirect
3974
github.com/go-openapi/jsonpointer v0.21.1 // indirect
4075
github.com/go-openapi/jsonreference v0.21.0 // indirect
76+
github.com/go-openapi/loads v0.22.0 // indirect
77+
github.com/go-openapi/spec v0.21.0 // indirect
78+
github.com/go-openapi/strfmt v0.23.0 // indirect
4179
github.com/go-openapi/swag v0.23.1 // indirect
80+
github.com/go-openapi/validate v0.24.0 // indirect
81+
github.com/go-resty/resty/v2 v2.16.3 // indirect
4282
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
83+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
84+
github.com/go-zookeeper/zk v1.0.4 // indirect
4385
github.com/gogo/protobuf v1.3.2 // indirect
86+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
4487
github.com/golang/protobuf v1.5.4 // indirect
4588
github.com/golang/snappy v1.0.0 // indirect
4689
github.com/google/btree v1.1.3 // indirect
4790
github.com/google/certificate-transparency-go v1.1.7 // indirect
4891
github.com/google/gnostic-models v0.6.9 // indirect
4992
github.com/google/go-cmp v0.7.0 // indirect
93+
github.com/google/go-querystring v1.1.0 // indirect
5094
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
95+
github.com/google/s2a-go v0.1.9 // indirect
5196
github.com/google/uuid v1.6.0 // indirect
97+
github.com/googleapis/enterprise-certificate-proxy v0.3.5 // indirect
98+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
99+
github.com/gophercloud/gophercloud/v2 v2.6.0 // indirect
52100
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
101+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
102+
github.com/hashicorp/consul/api v1.31.2 // indirect
103+
github.com/hashicorp/cronexpr v1.1.2 // indirect
104+
github.com/hashicorp/errwrap v1.1.0 // indirect
105+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
106+
github.com/hashicorp/go-hclog v1.6.3 // indirect
107+
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
108+
github.com/hashicorp/go-multierror v1.1.1 // indirect
109+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
110+
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
111+
github.com/hashicorp/golang-lru v0.6.0 // indirect
112+
github.com/hashicorp/nomad/api v0.0.0-20241218080744-e3ac00f30eec // indirect
113+
github.com/hashicorp/serf v0.10.1 // indirect
114+
github.com/hetznercloud/hcloud-go/v2 v2.19.1 // indirect
115+
github.com/ionos-cloud/sdk-go/v6 v6.3.2 // indirect
116+
github.com/jmespath/go-jmespath v0.4.0 // indirect
53117
github.com/jmoiron/sqlx v1.3.5 // indirect
54118
github.com/josharian/intern v1.0.0 // indirect
119+
github.com/jpillora/backoff v1.0.0 // indirect
55120
github.com/json-iterator/go v1.1.12 // indirect
56121
github.com/klauspost/compress v1.18.0 // indirect
122+
github.com/knadh/koanf/maps v0.1.1 // indirect
123+
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
124+
github.com/knadh/koanf/v2 v2.1.2 // indirect
125+
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
126+
github.com/kylelemons/godebug v1.1.0 // indirect
127+
github.com/linode/linodego v1.47.0 // indirect
57128
github.com/mailru/easyjson v0.9.0 // indirect
129+
github.com/mattn/go-colorable v0.1.13 // indirect
130+
github.com/mattn/go-isatty v0.0.20 // indirect
131+
github.com/mdlayher/socket v0.4.1 // indirect
132+
github.com/mdlayher/vsock v1.2.1 // indirect
133+
github.com/miekg/dns v1.1.63 // indirect
134+
github.com/mitchellh/copystructure v1.2.0 // indirect
135+
github.com/mitchellh/go-homedir v1.1.0 // indirect
136+
github.com/mitchellh/mapstructure v1.5.0 // indirect
137+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
138+
github.com/moby/docker-image-spec v1.3.1 // indirect
58139
github.com/moby/spdystream v0.5.0 // indirect
59140
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
60141
github.com/modern-go/reflect2 v1.0.2 // indirect
61142
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
143+
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
62144
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
145+
github.com/nsf/jsondiff v0.0.0-20230430225905-43f6cf3098c1 // indirect
146+
github.com/oklog/ulid v1.3.1 // indirect
147+
github.com/oklog/ulid/v2 v2.1.0 // indirect
148+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.121.0 // indirect
149+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.121.0 // indirect
150+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.121.0 // indirect
151+
github.com/opencontainers/go-digest v1.0.0 // indirect
152+
github.com/opencontainers/image-spec v1.0.2 // indirect
153+
github.com/ovh/go-ovh v1.7.0 // indirect
63154
github.com/pelletier/go-toml v1.9.5 // indirect
64155
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
156+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
65157
github.com/pkg/errors v0.9.1 // indirect
158+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
159+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
160+
github.com/prometheus/alertmanager v0.28.0 // indirect
66161
github.com/prometheus/client_golang v1.22.0 // indirect
67162
github.com/prometheus/client_model v0.6.2 // indirect
68163
github.com/prometheus/common v0.63.0 // indirect
164+
github.com/prometheus/exporter-toolkit v0.14.0 // indirect
69165
github.com/prometheus/procfs v0.16.1 // indirect
166+
github.com/prometheus/prometheus v0.303.1 // indirect
167+
github.com/prometheus/sigv4 v0.1.2 // indirect
168+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32 // indirect
70169
github.com/spaolacci/murmur3 v1.1.0 // indirect
71170
github.com/spf13/pflag v1.0.6 // indirect
171+
github.com/stretchr/testify v1.10.0 // indirect
172+
github.com/vultr/govultr/v2 v2.17.2 // indirect
72173
github.com/weppos/publicsuffix-go v0.30.2-0.20230730094716-a20f9abcc222 // indirect
73174
github.com/x448/float16 v0.8.4 // indirect
175+
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
74176
github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c // indirect
75177
github.com/zmap/zlint/v3 v3.6.0 // indirect
178+
go.mongodb.org/mongo-driver v1.14.0 // indirect
179+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
180+
go.opentelemetry.io/collector/component v1.27.0 // indirect
181+
go.opentelemetry.io/collector/confmap v1.27.0 // indirect
182+
go.opentelemetry.io/collector/confmap/xconfmap v0.121.0 // indirect
183+
go.opentelemetry.io/collector/consumer v1.27.0 // indirect
184+
go.opentelemetry.io/collector/pdata v1.27.0 // indirect
185+
go.opentelemetry.io/collector/pipeline v0.121.0 // indirect
186+
go.opentelemetry.io/collector/processor v0.121.0 // indirect
187+
go.opentelemetry.io/collector/semconv v0.121.0 // indirect
188+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.60.0 // indirect
189+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
190+
go.opentelemetry.io/otel v1.35.0 // indirect
191+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
192+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
193+
go.uber.org/atomic v1.11.0 // indirect
76194
go.uber.org/automaxprocs v1.6.0 // indirect
195+
go.uber.org/goleak v1.3.0 // indirect
77196
go.uber.org/multierr v1.11.0 // indirect
78197
go.uber.org/zap v1.27.0 // indirect
79198
golang.org/x/crypto v0.38.0 // indirect
199+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
80200
golang.org/x/oauth2 v0.30.0 // indirect
81201
golang.org/x/sync v0.14.0 // indirect
82202
golang.org/x/sys v0.33.0 // indirect
83203
golang.org/x/term v0.32.0 // indirect
84204
golang.org/x/time v0.11.0 // indirect
85205
golang.org/x/tools v0.31.0 // indirect
86206
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
207+
google.golang.org/api v0.224.0 // indirect
208+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
209+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
210+
google.golang.org/grpc v1.71.0 // indirect
87211
google.golang.org/protobuf v1.36.6 // indirect
88212
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
89213
gopkg.in/inf.v0 v0.9.1 // indirect
214+
gopkg.in/yaml.v2 v2.4.0 // indirect
90215
gopkg.in/yaml.v3 v3.0.1 // indirect
91216
k8s.io/apiextensions-apiserver v0.32.2 // indirect
92217
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
@@ -95,3 +220,5 @@ require (
95220
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
96221
sigs.k8s.io/yaml v1.4.0 // indirect
97222
)
223+
224+
tool github.com/prometheus/prometheus/cmd/promtool

0 commit comments

Comments
 (0)