Skip to content

Commit

Permalink
build(makefile): bump toolchain in makefile to latest version (#99)
Browse files Browse the repository at this point in the history
  • Loading branch information
whg517 authored Nov 7, 2024
1 parent a241e41 commit d2cd239
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ 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.35.0
OPERATOR_SDK_VERSION ?= v1.37.0

# Image URL to use all building/pushing image targets
IMG ?= $(IMAGE_TAG_BASE):$(VERSION)
Expand Down Expand Up @@ -117,7 +117,7 @@ vet: ## Run go vet against code.
go vet ./...

GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
GOLANGCI_LINT_VERSION ?= v1.60.3
GOLANGCI_LINT_VERSION ?= v1.61.0
golangci-lint:
@[ -f $(GOLANGCI_LINT) ] || { \
set -e ;\
Expand Down Expand Up @@ -215,8 +215,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v5.4.2
CONTROLLER_TOOLS_VERSION ?= v0.16.2
KUSTOMIZE_VERSION ?= v5.5.0
CONTROLLER_TOOLS_VERSION ?= v0.16.5

.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.
Expand Down Expand Up @@ -378,9 +378,9 @@ helm-uninstall: ## Uninstall the helm chart.
$(HELM) uninstall --namespace $(TEST_NAMESPACE) $(PROJECT_NAME)

# kind
KIND_VERSION ?= v0.23.0
KIND_VERSION ?= v0.24.0

KINDTEST_K8S_VERSION ?= 1.26.14
KINDTEST_K8S_VERSION ?= 1.26.15

KIND_IMAGE ?= kindest/node:v${KINDTEST_K8S_VERSION}

Expand Down Expand Up @@ -416,7 +416,7 @@ kind-delete: kind ## Delete a kind cluster.

# chainsaw

CHAINSAW_VERSION ?= v0.2.8
CHAINSAW_VERSION ?= v0.2.11
CHAINSAW ?= $(LOCALBIN)/chainsaw

# Use `grep 0.2.6 > /dev/null` instead of `grep -q 0.2.6`. It will not be able to determine the version number,
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/hbase.zncdata.dev_hbaseclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.16.5
name: hbaseclusters.hbase.zncdata.dev
spec:
group: hbase.zncdata.dev
Expand Down
4 changes: 2 additions & 2 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ resources:
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
#- ../prometheus

patchesStrategicMerge:
patches:
# Protect the /metrics endpoint by putting it behind auth.
# If you want your controller-manager to expose the /metrics
# endpoint w/o any authn/z, please comment the following line.
- manager_auth_proxy_patch.yaml
- path: manager_auth_proxy_patch.yaml



Expand Down
2 changes: 1 addition & 1 deletion config/manifests/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:
# [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
# Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.
# These patches remove the unnecessary "cert" volume and its manager container volumeMount.
#patchesJson6902:
#patches:
#- target:
# group: apps
# version: v1
Expand Down
3 changes: 1 addition & 2 deletions config/scorecard/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resources:
- bases/config.yaml
patchesJson6902:
patches:
- path: patches/basic.config.yaml
target:
group: scorecard.operatorframework.io
Expand All @@ -13,4 +13,3 @@ patchesJson6902:
version: v1alpha3
kind: Configuration
name: config
#+kubebuilder:scaffold:patchesJson6902

0 comments on commit d2cd239

Please sign in to comment.