Skip to content

Commit 15692f1

Browse files
ZerpetZerpet
authored
Merge pull request #939 from rabbitmq/move-tools
Move tools to dedicated internal module
2 parents f93d1cb + 6459978 commit 15692f1

19 files changed

+403
-145
lines changed

‎Makefile‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,9 @@ list: ## List Makefile targets
2626
# Allows flexibility to use other build kits, like nerdctl
2727
BUILD_KIT ?= docker
2828

29-
define get_mod_code_generator
30-
echo "Only go get & mod k8s.io/code-generator, but do not install it"
31-
echo "⚠️ Keep it at the same version as captured in go.mod, otherwise we may end up with version inconsistencies"
32-
awk '/k8s.io\/code-generator/ { system("go get -d " $$1 "@" $$2) }' go.mod
33-
endef
3429
install-tools: ## Install tooling required to configure and build this repo
35-
go mod download
3630
@echo "Install all tools..."
37-
@awk -F '"' '/_/ && !/k8s.io\/code-generator/ { system("go install " $$2) }' tools/tools.go
38-
@$(get_mod_code_generator)
39-
go install golang.org/x/vuln/cmd/govulncheck@latest
31+
cd internal/tools; grep _ tools.go | awk -F '"' '{print $$2}' | xargs -t go install -mod=mod
4032

4133
LOCAL_TESTBIN = $(CURDIR)/testbin
4234
ENVTEST_K8S_VERSION = 1.26.1

‎config/crd/bases/rabbitmq.com_bindings.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.0
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: bindings.rabbitmq.com
88
spec:
99
group: rabbitmq.com

‎config/crd/bases/rabbitmq.com_exchanges.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.0
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: exchanges.rabbitmq.com
88
spec:
99
group: rabbitmq.com

‎config/crd/bases/rabbitmq.com_federations.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.0
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: federations.rabbitmq.com
88
spec:
99
group: rabbitmq.com

‎config/crd/bases/rabbitmq.com_operatorpolicies.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.0
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: operatorpolicies.rabbitmq.com
88
spec:
99
group: rabbitmq.com

‎config/crd/bases/rabbitmq.com_permissions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.0
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: permissions.rabbitmq.com
88
spec:
99
group: rabbitmq.com

‎config/crd/bases/rabbitmq.com_policies.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.0
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: policies.rabbitmq.com
88
spec:
99
group: rabbitmq.com

‎config/crd/bases/rabbitmq.com_queues.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.0
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: queues.rabbitmq.com
88
spec:
99
group: rabbitmq.com

‎config/crd/bases/rabbitmq.com_schemareplications.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.0
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: schemareplications.rabbitmq.com
88
spec:
99
group: rabbitmq.com

‎config/crd/bases/rabbitmq.com_shovels.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.0
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: shovels.rabbitmq.com
88
spec:
99
group: rabbitmq.com

0 commit comments

Comments
 (0)