@@ -108,7 +108,7 @@ KUSTOMIZE_BIN := kustomize
108
108
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR ) /$(KUSTOMIZE_BIN ) -$(KUSTOMIZE_VER ) )
109
109
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
110
110
111
- SETUP_ENVTEST_VER := v0.0.0-20231012212722-e25aeebc7846
111
+ SETUP_ENVTEST_VER := v0.0.0-20240215143116-d0396a3d6f9f
112
112
SETUP_ENVTEST_BIN := setup-envtest
113
113
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR ) /$(SETUP_ENVTEST_BIN ) -$(SETUP_ENVTEST_VER ) )
114
114
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
@@ -123,7 +123,7 @@ GOTESTSUM_BIN := gotestsum
123
123
GOTESTSUM := $(abspath $(TOOLS_BIN_DIR ) /$(GOTESTSUM_BIN ) -$(GOTESTSUM_VER ) )
124
124
GOTESTSUM_PKG := gotest.tools/gotestsum
125
125
126
- CONVERSION_GEN_VER := v0.29.0
126
+ CONVERSION_GEN_VER := v0.29.2
127
127
CONVERSION_GEN_BIN := conversion-gen
128
128
# We are intentionally using the binary without version suffix, to avoid the version
129
129
# in generated files.
@@ -145,7 +145,7 @@ HADOLINT_FAILURE_THRESHOLD = warning
145
145
146
146
SHELLCHECK_VER := v0.9.0
147
147
148
- TRIVY_VER := 0.47.0
148
+ TRIVY_VER := 0.49.1
149
149
150
150
KPROMO_VER := v4.0.5
151
151
KPROMO_BIN := kpromo
@@ -158,7 +158,7 @@ YQ_BIN := yq
158
158
YQ := $(abspath $(TOOLS_BIN_DIR ) /$(YQ_BIN ) -$(YQ_VER ) )
159
159
YQ_PKG := github.com/mikefarah/yq/v4
160
160
161
- PLANTUML_VER := 1.2023.10
161
+ PLANTUML_VER := 1.2024.3
162
162
163
163
GINKGO_BIN := ginkgo
164
164
GINKGO_VER := $(call get_go_version,github.com/onsi/ginkgo/v2)
@@ -183,7 +183,7 @@ IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss
183
183
CONVERSION_VERIFIER_BIN := conversion-verifier
184
184
CONVERSION_VERIFIER := $(abspath $(TOOLS_BIN_DIR ) /$(CONVERSION_VERIFIER_BIN ) )
185
185
186
- OPENAPI_GEN_VER := 5e7f5fd
186
+ OPENAPI_GEN_VER := 70dd376
187
187
OPENAPI_GEN_BIN := openapi-gen
188
188
# We are intentionally using the binary without version suffix, to avoid the version
189
189
# in generated files.
@@ -546,10 +546,11 @@ generate-go-openapi: $(OPENAPI_GEN) $(CONTROLLER_GEN) ## Generate openapi go cod
546
546
(cd ../ && $( MAKE) clean-generated-openapi-definitions SRC_DIRS=" ./$$ {pkg}" ); \
547
547
echo " ** Generating openapi schema for types in ./$$ {pkg} **" ; \
548
548
$(OPENAPI_GEN ) \
549
- --input-dirs=sigs.k8s.io/cluster-api/$$ {pkg} \
550
- --output-file-base=zz_generated.openapi \
551
- --output-package=sigs.k8s.io/cluster-api/$$ {pkg} \
552
- --go-header-file=../hack/boilerplate/boilerplate.generatego.txt; \
549
+ --output-dir=../$$ {pkg} \
550
+ --output-file=zz_generated.openapi.go \
551
+ --output-pkg=sigs.k8s.io/cluster-api/$$ {pkg} \
552
+ --go-header-file=../hack/boilerplate/boilerplate.generatego.txt \
553
+ sigs.k8s.io/cluster-api/$$ {pkg}; \
553
554
done ; \
554
555
rm sigs.k8s.io/cluster-api
555
556
0 commit comments