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.

Sign up for GitHub

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: bump versions of tools #455

Merged
merged 1 commit into from
Apr 9, 2024
Merged

chore: bump versions of tools #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions .github/tools
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# DO NOT EDIT! Autogenerated by make tools

golangci-lint v1.52.2
controller-gen v0.11.3
controller-gen v0.14.0
kustomize v4.5.2
oc v4.8.11
operator-sdk v1.31.0
opm v1.36.0
operator-sdk v1.34.1
opm v1.39.0
promq v0.0.1
crdoc v0.5.2
jsonnet v0.17.0
jsonnetfmt v0.17.0
jsonnet-lint v0.17.0
jb v0.4.0
gojsontoyaml 0.0.1
jsonnet v0.20.0
jsonnetfmt v0.20.0
jsonnet-lint v0.20.0
jb v0.5.1
gojsontoyaml v0.1.0
shellcheck 0.10.0
32 changes: 13 additions & 19 deletions Makefile.tools
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ TOOLS_DIR = $(shell pwd)/tmp/bin
# see: .github/tools-cache/action.yaml

CONTROLLER_GEN=$(TOOLS_DIR)/controller-gen
CONTROLLER_GEN_VERSION= v0.11.3
CONTROLLER_GEN_VERSION= v0.14.0

KUSTOMIZE=$(TOOLS_DIR)/kustomize
KUSTOMIZE_VERSION= v4.5.2

OPERATOR_SDK = $(TOOLS_DIR)/operator-sdk
OPERATOR_SDK_VERSION = v1.31.0
OPERATOR_SDK_VERSION = v1.34.1

OPM=$(TOOLS_DIR)/opm
OPM_VERSION = v1.36.0
OPM_VERSION = v1.39.0

GOLANGCI_LINT=$(TOOLS_DIR)/golangci-lint
GOLANGCI_LINT_VERSION = v1.52.2
Expand All @@ -36,21 +36,15 @@ CRDOC_VERSION = v0.5.2

# jsonnet related tools and dependencies
JSONNET = $(TOOLS_DIR)/jsonnet
JSONNET_VERSION = v0.17.0

JSONNETFMT = $(TOOLS_DIR)/jsonnetfmt
JSONNETFMT_VERSION = v0.17.0

JSONNET_LINT = $(TOOLS_DIR)/jsonnet-lint
JSONNET_LINT_VERSION = v0.17.0
JSONNET_VERSION = v0.20.0

JB = $(TOOLS_DIR)/jb
JB_VERSION = v0.4.0
JB_VERSION = v0.5.1

## NOTE: gojsontoyaml does not have any releases, so we use a fake version starting with v0.0.1
# thus to upgrade/invalidate the github cache, increment the value
GOJSONTOYAML = $(TOOLS_DIR)/gojsontoyaml
GOJSONTOYAML_VERSION = 0.0.1
GOJSONTOYAML_VERSION = v0.1.0

JSONNET_VENDOR = jsonnet/vendor
JSONNETFMT_ARGS = -n 2 --max-blank-lines 2 --string-style s --comment-style s
Expand Down Expand Up @@ -152,7 +146,7 @@ $(JSONNET) jsonnet: $(TOOLS_DIR)
@{ \
set -ex ;\
[[ -f $(JSONNET) ]] && exit 0 ;\
GOBIN=$(TOOLS_DIR) go install github.com/google/go-jsonnet/cmd/jsonnet@latest ;\
GOBIN=$(TOOLS_DIR) go install github.com/google/go-jsonnet/cmd/jsonnet@$(JSONNET_VERSION) ;\
}


Expand All @@ -161,31 +155,31 @@ $(JSONNETFMT) jsonnetfmt: $(TOOLS_DIR)
@{ \
set -ex ;\
[[ -f $(JSONNETFMT) ]] && exit 0 ;\
GOBIN=$(TOOLS_DIR) go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest ;\
GOBIN=$(TOOLS_DIR) go install github.com/google/go-jsonnet/cmd/jsonnetfmt@$(JSONNET_VERSION) ;\
}

.PHONY: jsonnet-lint
$(JSONNET_LINT) jsonnet-lint: $(TOOLS_DIR)
@{ \
set -ex ;\
[[ -f $(JSONNET_LINT) ]] && exit 0 ;\
GOBIN=$(TOOLS_DIR) go install github.com/google/go-jsonnet/cmd/jsonnet-lint@latest ;\
GOBIN=$(TOOLS_DIR) go install github.com/google/go-jsonnet/cmd/jsonnet-lint@$(JSONNET_VERSION) ;\
}

.PHONY: jb
$(JB) jb: $(TOOLS_DIR)
@{ \
set -ex ;\
[[ -f $(JB) ]] && exit 0 ;\
GOBIN=$(TOOLS_DIR) go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest ;\
GOBIN=$(TOOLS_DIR) go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@$(JB_VERSION) ;\
}

.PHONY: gojsontoyaml
$(GOJSONTOYAML) gojsontoyaml: $(TOOLS_DIR)
@{ \
set -ex ;\
[[ -f $(GOJSONTOYAML) ]] && exit 0 ;\
GOBIN=$(TOOLS_DIR) go install github.com/brancz/gojsontoyaml@latest ;\
GOBIN=$(TOOLS_DIR) go install github.com/brancz/gojsontoyaml@$(GOJSONTOYAML_VERSION) ;\
}

.PHONY: shellcheck
Expand Down Expand Up @@ -230,8 +224,8 @@ tools: $(CONTROLLER_GEN) \
echo $$(basename $(PROMQ)) $(PROMQ_VERSION) >> $$tools_file ;\
echo $$(basename $(CRDOC)) $(CRDOC_VERSION) >> $$tools_file ; \
echo $$(basename $(JSONNET)) $(JSONNET_VERSION) >> $$tools_file ;\
echo $$(basename $(JSONNETFMT)) $(JSONNETFMT_VERSION) >> $$tools_file ;\
echo $$(basename $(JSONNET_LINT)) $(JSONNET_LINT_VERSION) >> $$tools_file ;\
echo $$(basename $(JSONNETFMT)) $(JSONNET_VERSION) >> $$tools_file ;\
echo $$(basename $(JSONNET_LINT)) $(JSONNET_VERSION) >> $$tools_file ;\
echo $$(basename $(JB)) $(JB_VERSION) >> $$tools_file ;\
echo $$(basename $(GOJSONTOYAML)) $(GOJSONTOYAML_VERSION) >> $$tools_file ;\
echo $$(basename $(SHELLCHECK)) $(SHELLCHECK_VERSION) >> $$tools_file ;\
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=observability-operator
LABEL operators.operatorframework.io.bundle.channels.v1=development
LABEL operators.operatorframework.io.bundle.channel.default.v1=development
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.1
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=unknown

Expand Down
Loading
Loading