Import notebook controller images using ImageStreams (#584)

Fix a issue with the ODH notebook controller where the notebook couldn't start when the notebook images was referenced by a ImageStream.

See opendatahub-io/kubeflow#27

Author: Samu

odh-notebook-controller/gen_kubeflow_manifests.sh

@@ -5,7 +5,7 @@ ctrl_dir="kf-notebook-controller"
 ctrl_repository="github.com/opendatahub-io/kubeflow"
 ctrl_branch="master"
 ctrl_image="quay.io/opendatahub/kubeflow-notebook-controller"
-ctrl_tag="1.6-55d78ca"
+ctrl_tag="1.6-57a7a0d"
 ctrl_namespace="opendatahub"
 
 cleanup() {
@@ -38,14 +38,15 @@ echo -n ".. Copying controller/default folder"
 cp -r "${ctrl_controller_dir}/config/default" ${ctrl_dir}/default
 echo -e "\r ✓"
 
-echo -n "   .. Updating controller namespace to opendatahub"
-sed -i 's,namespace:.*,namespace: '${ctrl_namespace}',g' ${ctrl_dir}/default/kustomization.yaml
-echo -e "\r    ✓"
 echo -n ".. Copying controller/overlays folder"
 mkdir ${ctrl_dir}/overlays
 cp -r "${ctrl_controller_dir}/config/overlays/openshift" ${ctrl_dir}/overlays/openshift
 echo -e "\r ✓"
 
+echo -n "   .. Updating controller namespace to opendatahub"
+sed -i 's,namespace:.*,namespace: '${ctrl_namespace}',g' ${ctrl_dir}/overlays/openshift/kustomization.yaml
+echo -e "\r    ✓"
+
 echo -n "   .. Updating controller image"
 sed -i 's,newName:.*,newName: '${ctrl_image}',g' ${ctrl_dir}/overlays/openshift/kustomization.yaml
 sed -i 's,newTag:.*,newTag: '${ctrl_tag}',g' ${ctrl_dir}/overlays/openshift/kustomization.yaml

odh-notebook-controller/gen_odh_manifests.sh

@@ -5,7 +5,7 @@ ctrl_dir="odh-notebook-controller"
 ctrl_repository="github.com/opendatahub-io/kubeflow"
 ctrl_branch="master"
 ctrl_image="quay.io/opendatahub/odh-notebook-controller"
-ctrl_tag="1.6-55d78ca"
+ctrl_tag="1.6-57a7a0d"
 ctrl_namespace="opendatahub"
 
 cleanup() {

odh-notebook-controller/kf-notebook-controller/default/kustomization.yaml

@@ -1,5 +1,5 @@
 # Adds namespace to all resources.
-namespace: opendatahub
+namespace: notebook-controller-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named

odh-notebook-controller/kf-notebook-controller/overlays/openshift/kustomization.yaml

@@ -3,15 +3,15 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../base
-namespace: notebook-controller-system
+namespace: opendatahub
 commonLabels:
   app.kubernetes.io/part-of: odh-notebook-controller
   component.opendatahub.io/name: kf-notebook-controller
   opendatahub.io/component: "true"
 images:
   - name: public.ecr.aws/j1r0q0g6/notebooks/notebook-controller
     newName: quay.io/opendatahub/kubeflow-notebook-controller
-    newTag: 1.6-55d78ca
+    newTag: 1.6-57a7a0d
 configMapGenerator:
   - name: config
     behavior: merge

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: 1.6-55d78ca
+    newTag: 1.6-57a7a0d

odh-notebook-controller/odh-notebook-controller/rbac/role.yaml

@@ -25,6 +25,7 @@ rules:
   verbs:
   - get
   - list
+  - patch
   - watch
 - apiGroups:
   - kubeflow.org

tests/basictests/odh-notebook-controller.sh

@@ -75,7 +75,7 @@ function test_notebook_deletion() {
     local notebook_path=${1}
     local notebook_name=${2}
     # Delete the notebook object
-    os::cmd::expect_success "oc delete notebook ${notebook_name}"
+    os::cmd::expect_success "oc delete -f ${notebook_path}"
     # Verify the notebook CR does not exist anymore
     os::cmd::try_until_text "oc get notebook ${notebook_name}" "not found" $odhdefaulttimeout $odhdefaultinterval
     # Verify the notebook STS is deleted

tests/resources/notebook-controller/notebooks/kubeflow-jupyter-oauth-notebook.yaml

@@ -1,3 +1,19 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: kubeflow-jupyter-scipy
+spec:
+  tags:
+    - name: v1.6.0
+      from:
+        kind: DockerImage
+        name: docker.io/kubeflownotebookswg/jupyter-scipy:v1.6.0-rc.0
+      referencePolicy:
+        type: Local
+  lookupPolicy:
+    local: true
+
 ---
 apiVersion: kubeflow.org/v1
 kind: Notebook
@@ -14,7 +30,7 @@ spec:
         fsGroup: 100
       containers:
         - name: kubeflow-jupyter-oauth-notebook
-          image: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.5.0
+          image: image-registry.openshift-image-registry.svc:5000/opendatahub/kubeflow-jupyter-scipy:v1.6.0
           imagePullPolicy: Always
           ports:
             - name: notebook-port

tests/resources/notebook-controller/notebooks/thoth-generic-oauth-notebook.yaml

@@ -1,3 +1,19 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: thoth-generic-data-science-notebook
+spec:
+  tags:
+    - name: v0.0.5
+      from:
+        kind: DockerImage
+        name: quay.io/thoth-station/s2i-generic-data-science-notebook:v0.0.5
+      referencePolicy:
+        type: Local
+  lookupPolicy:
+    local: true
+
 ---
 apiVersion: kubeflow.org/v1
 kind: Notebook
@@ -10,7 +26,7 @@ spec:
     spec:
       containers:
         - name: thoth-generic-oauth-notebook
-          image: quay.io/thoth-station/s2i-generic-data-science-notebook:v0.0.5
+          image: image-registry.openshift-image-registry.svc:5000/opendatahub/thoth-generic-data-science-notebook:v0.0.5
           imagePullPolicy: Always
           workingDir: /opt/app-root/src
           env:

tests/resources/notebook-controller/notebooks/thoth-minimal-notebook.yaml

@@ -1,3 +1,19 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: thoth-minimal-notebook
+spec:
+  tags:
+    - name: v0.3.0
+      from:
+        kind: DockerImage
+        name: quay.io/thoth-station/s2i-minimal-notebook:v0.3.0
+      referencePolicy:
+        type: Local
+  lookupPolicy:
+    local: true
+
 ---
 apiVersion: kubeflow.org/v1
 kind: Notebook
@@ -8,7 +24,7 @@ spec:
     spec:
       containers:
         - name: thoth-minimal-notebook
-          image: quay.io/thoth-station/s2i-minimal-notebook:v0.3.0
+          image: image-registry.openshift-image-registry.svc:5000/opendatahub/thoth-minimal-notebook:v0.3.0
           imagePullPolicy: Always
           workingDir: /opt/app-root/src
           env: