Sync odh-notebook-controller v1.7 manifests to odh-manifests

Signed-off-by: Harshad Reddy Nalla <hnalla@redhat.com>
opendatahub-io · Jul 21, 2023 · 6ea17aa · 6ea17aa
1 parent ace70af
commit 6ea17aa
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 11 deletions.
diff --git a/odh-notebook-controller/gen_kubeflow_manifests.sh b/odh-notebook-controller/gen_kubeflow_manifests.sh
@@ -3,9 +3,9 @@ set -eu -o pipefail
 
 ctrl_dir="kf-notebook-controller"
 ctrl_repository="github.com/opendatahub-io/kubeflow"
-ctrl_branch="v1.6-branch"
+ctrl_branch="v1.7-branch"
 ctrl_image="quay.io/opendatahub/kubeflow-notebook-controller"
-ctrl_tag="v1.6.1-2"
+ctrl_tag="v1.7.0-1"
 ctrl_namespace="opendatahub"
 
 cleanup() {

diff --git a/odh-notebook-controller/gen_odh_manifests.sh b/odh-notebook-controller/gen_odh_manifests.sh
@@ -3,9 +3,9 @@ set -eu -o pipefail
 
 ctrl_dir="odh-notebook-controller"
 ctrl_repository="github.com/opendatahub-io/kubeflow"
-ctrl_branch="v1.6-branch"
+ctrl_branch="v1.7-branch"
 ctrl_image="quay.io/opendatahub/odh-notebook-controller"
-ctrl_tag="v1.6.1-2"
+ctrl_tag="v1.7.0-1"
 ctrl_namespace="opendatahub"
 
 cleanup() {

diff --git a/odh-notebook-controller/kf-notebook-controller/base/kustomization.yaml b/odh-notebook-controller/kf-notebook-controller/base/kustomization.yaml
@@ -4,4 +4,5 @@ resources:
 - ../default
 images:
 - name: docker.io/kubeflownotebookswg/notebook-controller
-  newTag: v1.6.1
+  newName: docker.io/kubeflownotebookswg/notebook-controller
+  newTag: v1.7.0
diff --git a/odh-notebook-controller/kf-notebook-controller/crd/patches/trivial_conversion_patch.yaml b/odh-notebook-controller/kf-notebook-controller/crd/patches/trivial_conversion_patch.yaml
@@ -4,6 +4,5 @@ kind: CustomResourceDefinition
 metadata:
   name: notebooks.kubeflow.org
 spec:
-  preserveUnknownFields: false # TODO: Remove in Kubeflow 1.7 release
   conversion:
     strategy: None
diff --git a/odh-notebook-controller/kf-notebook-controller/manager/kustomization.yaml b/odh-notebook-controller/kf-notebook-controller/manager/kustomization.yaml
@@ -4,8 +4,7 @@ resources:
   - service.yaml
 configMapGenerator:
   - name: config
-    literals:
-      - USE_ISTIO=true
-      - ISTIO_GATEWAY=kubeflow/kubeflow-gateway
+    envs:
+      - params.env
 generatorOptions:
   disableNameSuffixHash: true
diff --git a/odh-notebook-controller/kf-notebook-controller/manager/manager.yaml b/odh-notebook-controller/kf-notebook-controller/manager/manager.yaml
@@ -36,6 +36,21 @@ spec:
               configMapKeyRef:
                 name: config
                 key: ISTIO_GATEWAY
+          - name: ENABLE_CULLING
+            valueFrom:
+              configMapKeyRef:
+                name: notebook-controller-culler-config
+                key: ENABLE_CULLING
+          - name: CULL_IDLE_TIME
+            valueFrom:
+              configMapKeyRef:
+                name: notebook-controller-culler-config
+                key: CULL_IDLE_TIME
+          - name: IDLENESS_CHECK_PERIOD
+            valueFrom:
+              configMapKeyRef:
+                name: notebook-controller-culler-config
+                key: IDLENESS_CHECK_PERIOD
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

diff --git a/odh-notebook-controller/kf-notebook-controller/manager/params.env b/odh-notebook-controller/kf-notebook-controller/manager/params.env
@@ -1,2 +1,6 @@
 USE_ISTIO=true
 ISTIO_GATEWAY=kubeflow/kubeflow-gateway
+CLUSTER_DOMAIN=cluster.local
+ENABLE_CULLING=false
+CULL_IDLE_TIME=1440
+IDLENESS_CHECK_PERIOD=1
diff --git a/odh-notebook-controller/kf-notebook-controller/overlays/openshift/kustomization.yaml b/odh-notebook-controller/kf-notebook-controller/overlays/openshift/kustomization.yaml
@@ -11,7 +11,7 @@ commonLabels:
 images:
   - name: docker.io/kubeflownotebookswg/notebook-controller
     newName: quay.io/opendatahub/kubeflow-notebook-controller
-    newTag: v1.6.1-2
+    newTag: v1.7.0-1
 configMapGenerator:
   - name: config
     behavior: merge

diff --git a/...otebook-controller/kf-notebook-controller/overlays/openshift/manager_openshift_patch.yaml b/...otebook-controller/kf-notebook-controller/overlays/openshift/manager_openshift_patch.yaml
@@ -3,6 +3,7 @@ kind: Deployment
 metadata:
   name: deployment
 spec:
+  replicas: 1
   template:
     spec:
       containers:

diff --git a/odh-notebook-controller/odh-notebook-controller/base/kustomization.yaml b/odh-notebook-controller/odh-notebook-controller/base/kustomization.yaml
@@ -6,4 +6,4 @@ resources:
 images:
   - name: quay.io/opendatahub/odh-notebook-controller
     newName: quay.io/opendatahub/odh-notebook-controller
-    newTag: v1.6.1-2
+    newTag: v1.7.0-1