Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update tools #157

Merged
merged 1 commit into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ ifeq ($(USE_IMAGE_DIGESTS), true)
BUNDLE_GEN_FLAGS += --use-image-digests
endif

# Set the Operator SDK version to use. By default, what is installed on the system is used.
# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
OPERATOR_SDK_VERSION ?= v1.32.0

# Image URL to use all building/pushing image targets
IMG ?= ${IMAGE_TAG_BASE}:${IMG_VERSION}
Expand Down Expand Up @@ -148,7 +145,7 @@ check: check/lint

.PHONY: check/lint
check/lint: golangci-lint
@$(GL) run \
@$(GOLANG_LINT) run \
--config .golangci.yml \
--out-format tab \
--skip-dirs etc \
Expand All @@ -157,7 +154,7 @@ check/lint: golangci-lint

.PHONY: check/lint/fix
check/lint/fix: golangci-lint
@$(GL) run \
@$(GOLANG_LINT) run \
--config .golangci.yml \
--out-format tab \
--skip-dirs etc \
Expand Down Expand Up @@ -230,14 +227,16 @@ $(LOCALBIN):

## Tool Binaries
KUSTOMIZE ?= $(LOCALBIN)/kustomize
GL ?= $(LOCALBIN)/golangci-lint
GOLANG_LINT ?= $(LOCALBIN)/golangci-lint
GOIMPORT ?= $(LOCALBIN)/goimports
YQ ?= $(LOCALBIN)/yq

## Tool Versions
KUSTOMIZE_VERSION ?= v3.8.7
KUSTOMIZE_VERSION ?= v5.3.0
CONTROLLER_TOOLS_VERSION ?= v0.13.0
CODEGEN_VERSION := v0.27.4
CODEGEN_VERSION ?= v0.29.0
GOLANG_LINT_VERSION ?= v1.55.2
OPERATOR_SDK_VERSION ?= v1.33.0

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
.PHONY: kustomize
Expand Down Expand Up @@ -267,10 +266,10 @@ endif
endif

.PHONY: golangci-lint
golangci-lint: $(GL)
$(GL): $(LOCALBIN)
golangci-lint: $(GOLANG_LINT)
$(GOLANG_LINT): $(LOCALBIN)
@test -s $(LOCALBIN)/golangci-lint || \
GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.1
GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANG_LINT_VERSION)

.PHONY: goimport
goimport: $(GOIMPORT)
Expand All @@ -285,8 +284,6 @@ $(YQ): $(LOCALBIN)
@test -s $(LOCALBIN)/yq || \
GOBIN=$(LOCALBIN) go install github.com/mikefarah/yq/v4@latest



.PHONY: bundle
bundle: manifests kustomize operator-sdk yq ## Generate bundle manifests and metadata, then validate generated files.
$(OPERATOR_SDK) generate kustomize manifests -q
Expand Down
2 changes: 1 addition & 1 deletion apis/designer/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions pkg/client/kaoto/informers/externalversions/factory.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.