Skip to content

Commit 2ab35a7

Browse files
committed
Read pipeline runtime image name from the imagestream tag
Signed-off-by: Harshad Reddy Nalla <[email protected]>
1 parent 690694f commit 2ab35a7

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

components/odh-notebook-controller/controllers/notebook_runtime.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,15 @@ func (r *OpenshiftNotebookReconciler) syncRuntimeImagesConfigMap(ctx context.Con
9090
if !ok || metadataRaw == "" {
9191
metadataRaw = "[]"
9292
}
93+
// Extract image URL
94+
image_url, found, err := unstructured.NestedString(tagMap, "from", "name")
95+
if err != nil || !found {
96+
log.Error(err, "Failed to extract image URL from ImageStream", "ImageStream", item.GetName())
97+
continue
98+
}
9399

94100
// Parse metadata
95-
metadataParsed := parseRuntimeImageMetadata(metadataRaw)
101+
metadataParsed := parseRuntimeImageMetadata(metadataRaw, image_url)
96102
displayName := extractDisplayName(metadataParsed)
97103

98104
// Construct the key name
@@ -182,14 +188,22 @@ func formatKeyName(displayName string) string {
182188
}
183189

184190
// parseRuntimeImageMetadata extracts the first object from the JSON array
185-
func parseRuntimeImageMetadata(rawJSON string) string {
191+
func parseRuntimeImageMetadata(rawJSON string, image_url string) string {
186192
var metadataArray []map[string]interface{}
187193

188194
err := json.Unmarshal([]byte(rawJSON), &metadataArray)
189195
if err != nil || len(metadataArray) == 0 {
190196
return "{}" // Return empty JSON object if parsing fails
191197
}
192198

199+
// Insert image_url into the metadataArray
200+
if metadataArray[0]["metadata"] != nil {
201+
metadata, ok := metadataArray[0]["metadata"].(map[string]interface{})
202+
if ok {
203+
metadata["image_name"] = image_url
204+
}
205+
}
206+
193207
// Convert first object back to JSON
194208
metadataJSON, err := json.Marshal(metadataArray[0])
195209
if err != nil {

0 commit comments

Comments
 (0)