Merge pull request #125 from opendatahub-io/v1.9-branch

Sync master from odh v1.9-branch to get the latest changes ready for rhoai-nightly

.github/workflows/notebook_controller_integration_test.yaml

@@ -89,7 +89,7 @@ jobs:
           export PR_NOTEBOOK_IMG=localhost/${{env.IMG}}:${{env.TAG}}
           kustomize edit set image ${CURRENT_NOTEBOOK_IMG}=${PR_NOTEBOOK_IMG}
 
-          cat <<EOF | oc apply -f -
+          cat <<EOF | kubectl apply -f -
           ---
           apiVersion: v1
           kind: ConfigMap

.github/workflows/odh_notebook_controller_integration_test.yaml

@@ -136,7 +136,7 @@ jobs:
           kustomize edit set image ${CURRENT_NOTEBOOK_IMG}=${PR_NOTEBOOK_IMG}
 
           # configure culler
-          cat <<EOF | oc apply -f -
+          cat <<EOF | kubectl apply -f -
           ---
           apiVersion: v1
           kind: ConfigMap
@@ -169,7 +169,7 @@ jobs:
 
           echo "odh-notebook-controller-image=localhost/${{env.IMG}}:${{env.TAG}}" > params.env
 
-          cat <<EOF | oc apply -f -
+          cat <<EOF | kubectl apply -f -
           ---
           apiVersion: v1
           kind: ConfigMap
@@ -225,7 +225,7 @@ jobs:
       - name: Create notebook and check it, this is from kubeflow readme
         run: |
           notebook_namespace=default
-          cat <<EOF | oc apply -f -
+          cat <<EOF | kubectl apply -f -
           ---
           apiVersion: kubeflow.org/v1
           kind: Notebook
@@ -271,6 +271,8 @@ jobs:
                         port: notebook-port
           EOF
 
+          # wait for the statefulset to be created
+          timeout 100 bash -c -- 'until kubectl get statefulset minimal-notebook; do sleep 1; done'
           # wait for the good result
           kubectl rollout status --watch statefulset minimal-notebook
           kubectl wait statefulset minimal-notebook --for=jsonpath='{.spec.replicas}'=1 --timeout=100s

.github/workflows/sync-branches-through-py.yaml → .github/workflows/sync-branches-through-pr.yaml

@@ -35,7 +35,7 @@ jobs:
           echo "branch=$SYNC_BRANCH" >> $GITHUB_OUTPUT
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c  # v6.1.0
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f  # v7.0.5
         with:
           branch: ${{ steps.prepare.outputs.branch }}
           title: "Sync `${{ github.event.inputs.target }}` branch with `${{ github.event.inputs.source }}` branch"

components/notebook-controller/Makefile

@@ -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.