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

Sync v1.9 branch from main to get the latest changes ready for rhoai-nightly #420

Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
NO-JIRA: chore(nbcs): update tooling in controller's Makefiles (#391)
* ```
bin/setup-envtest use 1.23 -p path
unable to find a version that was supported for platform darwin/arm64
```

* align with operator's and opendatahub-io/notebooks's kustomize version

* ```
make generate
GOBIN=/Users/jdanek/IdeaProjects/kubeflow/components/odh-notebook-controller/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0
/Users/jdanek/IdeaProjects/kubeflow/components/odh-notebook-controller/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
panic: runtime error: invalid memory address or nil pointer dereference [recovered]
        panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x2 addr=0x0 pc=0x1008a00a4]
```

* manifest changes after regen

* apply the same changes for notebook-controller as for odh-notebook-controller previously
  • Loading branch information
jiridanek authored Oct 2, 2024
commit 1b2dd4fa594937e81aeae886c476cecef19e6dc7
8 changes: 4 additions & 4 deletions components/notebook-controller/Makefile
Original file line number Diff line number Diff line change
@@ -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.

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

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

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

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions components/notebook-controller/config/rbac/role.yaml
Original file line number Diff line number Diff line change
@@ -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:
@@ -36,6 +29,12 @@ rules:
- services
verbs:
- '*'
- apiGroups:
- apps
resources:
- statefulsets
verbs:
- '*'
- apiGroups:
- kubeflow.org
resources:
6 changes: 3 additions & 3 deletions components/odh-notebook-controller/Makefile
Original file line number Diff line number Diff line change
@@ -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/setup-envtest@v0.0.0-20230216140739-c98506dc3b8e
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20240923090159-236e448db12c

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