NO-ISSUE: chore(sync): manually bring rhds into sync with odh v1.9 wh…

…ere they drifted The duplicated import is causing tests to fail.
jiridanek · Dec 4, 2024 · bdc09af · bdc09af
1 parent e61d16d
commit bdc09af
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/components/base/kustomization.yaml b/components/base/kustomization.yaml
@@ -3,4 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
   - ../notebook-controller/config/overlays/openshift
-  - ../odh-notebook-controller/config/base
+  - ../odh-notebook-controller/config/base
diff --git a/components/notebook-controller/config/overlays/openshift/manager_openshift_patch.yaml b/components/notebook-controller/config/overlays/openshift/manager_openshift_patch.yaml
@@ -39,4 +39,4 @@ spec:
               memory: 4Gi
             requests:
               cpu: 500m
-              memory: 256Mi
+              memory: 256Mi
diff --git a/components/odh-notebook-controller/controllers/notebook_controller_test.go b/components/odh-notebook-controller/controllers/notebook_controller_test.go
@@ -419,7 +419,6 @@ var _ = Describe("The Openshift Notebook controller", func() {
 			configMapName := "workbench-trusted-ca-bundle"
 			checkCertConfigMap(ctx, notebook.Namespace, configMapName, "ca-bundle.crt", 2)
 		})
-
 	})
 
 	When("Creating a Notebook, test Networkpolicies", func() {

diff --git a/components/odh-notebook-controller/e2e/helper_test.go b/components/odh-notebook-controller/e2e/helper_test.go
@@ -7,8 +7,6 @@ import (
 	"net/http"
 	"time"
 
-	netv1 "k8s.io/api/networking/v1"
-
 	nbv1 "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1"
 	routev1 "github.com/openshift/api/route/v1"
 	appsv1 "k8s.io/api/apps/v1"
-Original file line number
+Diff line change
@@ Expand Up @@
     			configMapName := "workbench-trusted-ca-bundle"
     			checkCertConfigMap(ctx, notebook.Namespace, configMapName, "ca-bundle.crt", 2)
     		})
     	})
     	When("Creating a Notebook, test Networkpolicies", func() {
@@ Expand Down @@