Skip to content

Commit 880564a

Browse files
authored
🌱 Makefile: bump dependencies (kubernetes-sigs#10236)
* Makefile: bump dependencies * kube-openapi generator fixes * regenerate diagrams
1 parent 22ec35e commit 880564a

File tree

54 files changed

+38
-35
lines changed

Some content is hidden

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

54 files changed

+38
-35
lines changed

Makefile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ KUSTOMIZE_BIN := kustomize
108108
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
109109
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
110110

111-
SETUP_ENVTEST_VER := v0.0.0-20231012212722-e25aeebc7846
111+
SETUP_ENVTEST_VER := v0.0.0-20240215143116-d0396a3d6f9f
112112
SETUP_ENVTEST_BIN := setup-envtest
113113
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
114114
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
@@ -123,7 +123,7 @@ GOTESTSUM_BIN := gotestsum
123123
GOTESTSUM := $(abspath $(TOOLS_BIN_DIR)/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER))
124124
GOTESTSUM_PKG := gotest.tools/gotestsum
125125

126-
CONVERSION_GEN_VER := v0.29.0
126+
CONVERSION_GEN_VER := v0.29.2
127127
CONVERSION_GEN_BIN := conversion-gen
128128
# We are intentionally using the binary without version suffix, to avoid the version
129129
# in generated files.
@@ -145,7 +145,7 @@ HADOLINT_FAILURE_THRESHOLD = warning
145145

146146
SHELLCHECK_VER := v0.9.0
147147

148-
TRIVY_VER := 0.47.0
148+
TRIVY_VER := 0.49.1
149149

150150
KPROMO_VER := v4.0.5
151151
KPROMO_BIN := kpromo
@@ -158,7 +158,7 @@ YQ_BIN := yq
158158
YQ := $(abspath $(TOOLS_BIN_DIR)/$(YQ_BIN)-$(YQ_VER))
159159
YQ_PKG := github.com/mikefarah/yq/v4
160160

161-
PLANTUML_VER := 1.2023.10
161+
PLANTUML_VER := 1.2024.3
162162

163163
GINKGO_BIN := ginkgo
164164
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
183183
CONVERSION_VERIFIER_BIN := conversion-verifier
184184
CONVERSION_VERIFIER := $(abspath $(TOOLS_BIN_DIR)/$(CONVERSION_VERIFIER_BIN))
185185

186-
OPENAPI_GEN_VER := 5e7f5fd
186+
OPENAPI_GEN_VER := 70dd376
187187
OPENAPI_GEN_BIN := openapi-gen
188188
# We are intentionally using the binary without version suffix, to avoid the version
189189
# in generated files.
@@ -546,10 +546,11 @@ generate-go-openapi: $(OPENAPI_GEN) $(CONTROLLER_GEN) ## Generate openapi go cod
546546
(cd ../ && $(MAKE) clean-generated-openapi-definitions SRC_DIRS="./$${pkg}"); \
547547
echo "** Generating openapi schema for types in ./$${pkg} **"; \
548548
$(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}; \
553554
done; \
554555
rm sigs.k8s.io/cluster-api
555556

api/v1beta1/zz_generated.openapi.go

Lines changed: 2 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
207 Bytes
-105 Bytes
-40 Bytes
-32 Bytes
-28 Bytes
-35 Bytes
-28 Bytes
-134 Bytes

0 commit comments

Comments
 (0)