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

Jump to bottom

NO-JIRA: chore(nbcs): update tooling in controller's Makefiles - kubernetes and kustomize #432

Merged
merged 2 commits into from
Nov 8, 2024
Merged

NO-JIRA: chore(nbcs): update tooling in controller's Makefiles - kubernetes and kustomize #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f3c742
[Test] Update the k8s tool used for the test execution
jstourac Oct 24, 2024
8dba731
[Fix] kustomize package version revision
jstourac Oct 25, 2024
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
2 changes: 1 addition & 1 deletion components/notebook-controller/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ controller-gen: ## Download controller-gen locally if necessary.
KUSTOMIZE = $(shell pwd)/bin/kustomize
.PHONY: kustomize
kustomize: ## Download kustomize locally if necessary.
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2)
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5@v5.0.2)

ENVTEST = $(shell pwd)/bin/setup-envtest
ENVTEST_VERSION?=v0.0.0-20240923090159-236e448db12c
Expand Down
4 changes: 2 additions & 2 deletions components/odh-notebook-controller/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ KF_TAG ?= main-3f931d2
CONTAINER_ENGINE ?= podman

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.23
ENVTEST_K8S_VERSION = 1.26

# Kubernetes configuration
K8S_NAMESPACE ?= odh-notebook-controller-system
Expand Down Expand Up @@ -241,7 +241,7 @@ controller-gen: ## Download controller-gen locally if necessary.
KUSTOMIZE = $(LOCALBIN)/kustomize
.PHONY: kustomize
kustomize: ## Download kustomize locally if necessary.
GOBIN=$(LOCALBIN) go install sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2
GOBIN=$(LOCALBIN) go install sigs.k8s.io/kustomize/kustomize/v5@v5.0.2

ENVTEST = $(LOCALBIN)/setup-envtest
.PHONY: envtest
Expand Down
2 changes: 1 addition & 1 deletion components/profile-controller/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TAG ?= $(shell git describe --tags --always --dirty)
ARCH ?= linux/amd64

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.23
ENVTEST_K8S_VERSION = 1.26

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down