diff --git a/backend/src/utils/notebookUtils.ts b/backend/src/utils/notebookUtils.ts index adaf935b59..01c7c56176 100644 --- a/backend/src/utils/notebookUtils.ts +++ b/backend/src/utils/notebookUtils.ts @@ -163,7 +163,6 @@ export const assembleNotebook = async ( const notebookSize = getNotebookSize(notebookSizeName); - let imageUrl = ``; let imageSelection = ``; try { @@ -171,7 +170,6 @@ export const assembleNotebook = async ( const selectedImage = getImageTag(image, imageTagName); - imageUrl = `${selectedImage.image?.dockerImageRepo}:${selectedImage.tag?.name}`; imageSelection = `${selectedImage.image?.name}:${selectedImage.tag?.name}`; } catch (e) { fastify.log.error(`Error getting the image for ${imageName}:${imageTagName}`); @@ -268,6 +266,7 @@ export const assembleNotebook = async ( }, annotations: { 'notebooks.opendatahub.io/oauth-logout-url': `${url}/notebookController/${translatedUsername}/home`, + 'image.openshift.io/triggers': `[{"from":{"kind":"ImageStreamTag","name":"${imageSelection}", "namespace":"${namespace}"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"${name}\\")].image"}]`, 'notebooks.opendatahub.io/last-size-selection': notebookSize.name, 'notebooks.opendatahub.io/last-image-selection': imageSelection, 'opendatahub.io/username': username, @@ -285,7 +284,7 @@ export const assembleNotebook = async ( enableServiceLinks: false, containers: [ { - image: imageUrl, + image: imageSelection, imagePullPolicy: 'Always', workingDir: MOUNT_PATH, name: name, @@ -301,7 +300,7 @@ export const assembleNotebook = async ( }, { name: 'JUPYTER_IMAGE', - value: imageUrl, + value: imageSelection, }, ...configMapEnvs, ...secretEnvs, diff --git a/frontend/src/api/k8s/notebooks.ts b/frontend/src/api/k8s/notebooks.ts index 85c496facf..b49fc12828 100644 --- a/frontend/src/api/k8s/notebooks.ts +++ b/frontend/src/api/k8s/notebooks.ts @@ -50,7 +50,6 @@ export const assembleNotebook = ( existingResources, } = data; const notebookId = overrideNotebookId || translateDisplayNameForK8s(notebookName); - const imageUrl = `${image.imageStream?.status?.dockerImageRepository}:${image.imageVersion?.name}`; const imageSelection = `${image.imageStream?.metadata.name}:${image.imageVersion?.name}`; const { affinity, tolerations, resources } = assemblePodSpecOptions( @@ -101,6 +100,7 @@ export const assembleNotebook = ( }, annotations: { 'openshift.io/display-name': notebookName.trim(), + 'image.openshift.io/triggers': `[{"from":{"kind":"ImageStreamTag","name":"${imageSelection}", "namespace":"${projectName}"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"${notebookId}\\")].image"}]`, 'openshift.io/description': description || '', 'notebooks.opendatahub.io/oauth-logout-url': `${origin}/projects/${projectName}?notebookLogout=${notebookId}`, 'notebooks.opendatahub.io/last-size-selection': notebookSize.name, @@ -120,7 +120,7 @@ export const assembleNotebook = ( enableServiceLinks: false, containers: [ { - image: imageUrl, + image: imageSelection, imagePullPolicy: 'Always', workingDir: ROOT_MOUNT_PATH, name: notebookId, @@ -136,7 +136,7 @@ export const assembleNotebook = ( }, { name: 'JUPYTER_IMAGE', - value: imageUrl, + value: imageSelection, }, ], envFrom,