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

NO-JIRA: chore(nbcs): update tooling in controller's Makefiles #391

Merged
merged 5 commits into from
Oct 2, 2024
Merged

NO-JIRA: chore(nbcs): update tooling in controller's Makefiles #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ff56b6
```
jiridanek Sep 25, 2024
60b940b
align with operator's and opendatahub-io/notebooks's kustomize version
jiridanek Sep 25, 2024
9889e3a
```
jiridanek Sep 25, 2024
0cd117e
manifest changes after regen
jiridanek Sep 25, 2024
3532395
apply the same changes for notebook-controller as for odh-notebook-co…
jiridanek Sep 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
8 changes: 4 additions & 4 deletions components/notebook-controller/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,18 @@ $(LOCALBIN): ## Ensure that the directory exists
CONTROLLER_GEN = $(LOCALBIN)/controller-gen
.PHONY: controller-gen
controller-gen: ## Download controller-gen locally if necessary.
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3

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@v3.2.0)
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2)

ENVTEST = $(shell pwd)/bin/setup-envtest
ENVTEST_VERSION?=release-0.14
ENVTEST_VERSION?=v0.0.0-20240923090159-236e448db12c

.PHONY: envtest
envtest: ## Download envtest-setup locally if necessary.
envtest: ## Download setup-envtest locally if necessary.
$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@$(ENVTEST_VERSION))

# go-get-tool will 'go get' any package $2 and install it to $1.
Expand Down
1 change: 0 additions & 1 deletion components/notebook-controller/api/v1/zz_generated.deepcopy.go
View file
Open in desktop

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

1 change: 0 additions & 1 deletion components/notebook-controller/api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

1 change: 0 additions & 1 deletion components/notebook-controller/api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

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

183 changes: 175 additions & 8 deletions components/notebook-controller/config/crd/bases/kubeflow.org_notebooks.yaml
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions components/notebook-controller/config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,8 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: role
rules:
- apiGroups:
- apps
resources:
- statefulsets
verbs:
- '*'
- apiGroups:
- ""
resources:
Expand All @@ -36,6 +29,12 @@ rules:
- services
verbs:
- '*'
- apiGroups:
- apps
resources:
- statefulsets
verbs:
- '*'
- apiGroups:
- kubeflow.org
resources:
Expand Down
6 changes: 3 additions & 3 deletions components/odh-notebook-controller/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,17 +229,17 @@ $(LOCALBIN): ## Ensure that the directory exists
CONTROLLER_GEN = $(LOCALBIN)/controller-gen
.PHONY: controller-gen
controller-gen: ## Download controller-gen locally if necessary.
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3

KUSTOMIZE = $(LOCALBIN)/kustomize
.PHONY: kustomize
kustomize: ## Download kustomize locally if necessary.
GOBIN=$(LOCALBIN) go install sigs.k8s.io/kustomize/v3/cmd/kustomize@v3.2.0
GOBIN=$(LOCALBIN) go install sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2

ENVTEST = $(LOCALBIN)/setup-envtest
.PHONY: envtest
envtest: ## Download setup-envtest locally if necessary.
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/[email protected]20230216140739-c98506dc3b8e
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/[email protected]20240923090159-236e448db12c

KTUNNEL = $(LOCALBIN)/ktunnel
.PHONY: ktunnel
Expand Down
1 change: 0 additions & 1 deletion components/odh-notebook-controller/config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: manager-role
rules:
- apiGroups:
Expand Down
1 change: 0 additions & 1 deletion components/odh-notebook-controller/config/webhook/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
metadata:
creationTimestamp: null
name: mutating-webhook-configuration
webhooks:
- admissionReviewVersions:
Expand Down