Merge branch 'main' into chore_411

Author: zdtsw

.github/scripts/manifest-utils.js

@@ -29,65 +29,98 @@ async function getLatestCommitSha(github, org, repo, ref) {
 }
 
 /**
- * Parse the get_all_manifests.sh file to extract component definitions
- * @param {string} filePath - Path to the manifest file
- * @returns {Map} Map of component name to component info
+ * Parse a manifest block from the content
+ * @param {string} content - Full file content
+ * @param {string} arrayName - Name of the array to extract (e.g., 'ODH_COMPONENT_MANIFESTS')
+ * @param {string} platform - Platform identifier ('odh' or 'rhoai')
+ * @returns {Array} Array of component info objects
  */
-function parseManifestFile(filePath) {
-    const content = fs.readFileSync(filePath, 'utf8');
-    const components = new Map();
+function parseManifestBlock(content, arrayName, platform) {
+    const components = [];
+
+    // Extract the entire manifest block using regex
+    const blockRegex = new RegExp(
+        `declare -A ${arrayName}=\\(([\\s\\S]*?)\\n\\)`,
+        'm'
+    );
+    const blockMatch = content.match(blockRegex);
+
+    if (!blockMatch) {
+        return components;
+    }
+
+    const blockContent = blockMatch[1];
 
     // Regex to match component manifest definitions (line by line)
     // Pattern: ["component"]="org:repo:ref:path"
-    const manifestRegex = /^\s*\["([^"]+)"\]="([^:]+):([^:]+):([^:]+):([^"]+)"$/;
-
-    const lines = content.split('\n');
-    for (const line of lines) {
-        const match = line.match(manifestRegex);
-        if (!match) {
-            continue;
-        }
+    const manifestRegex = /\["([^"]+)"\]="([^:]+):([^:]+):([^:]+):([^"]+)"/g;
 
+    let match;
+    while ((match = manifestRegex.exec(blockContent)) !== null) {
         const [fullMatch, componentName, org, repo, ref, sourcePath] = match;
 
-        components.set(componentName, {
+        components.push({
+            componentName,
             org,
             repo,
             ref,
             sourcePath,
-            originalLine: fullMatch.trim()
+            originalLine: fullMatch.trim(),
+            platform
         });
     }
 
     return components;
 }
 
+/**
+ * Parse the get_all_manifests.sh file to extract component definitions
+ * Now supports both ODH and RHOAI platform types
+ * @param {string} filePath - Path to the manifest file
+ * @returns {object} Object containing:
+ *   - odh: Array of component info for ODH
+ *   - rhoai: Array of component info for RHOAI
+ */
+function parseManifestFile(filePath) {
+    const content = fs.readFileSync(filePath, 'utf8');
+
+    // Parse both ODH and RHOAI manifest blocks
+    const odhComponents = parseManifestBlock(content, 'ODH_COMPONENT_MANIFESTS', 'odh');
+    const rhoaiComponents = parseManifestBlock(content, 'RHOAI_COMPONENT_MANIFESTS', 'rhoai');
+
+    return {
+        odh: odhComponents,
+        rhoai: rhoaiComponents
+    };
+}
+
 /**
  * Update the manifest file with new component information
  * @param {string} filePath - Path to the manifest file
- * @param {Map} updates - Map of component name to update info
+ * @param {Array} updates - Array of update objects containing componentName and update info
  */
 function updateManifestFile(filePath, updates) {
-    if (updates.size === 0) {
+    if (!updates || updates.length === 0) {
         console.log('No updates to apply');
         return false;
     }
 
     let content = fs.readFileSync(filePath, 'utf8');
     let hasChanges = false;
 
-    for (const [componentName, updateInfo] of updates) {
-        const oldLine = updateInfo.originalLine;
-        const newLine = `["${componentName}"]="${updateInfo.org}:${updateInfo.repo}:${updateInfo.newRef}:${updateInfo.sourcePath}"`;
+    for (const update of updates) {
+        const { componentName, org, repo, newRef, sourcePath, originalLine, logMessage } = update;
+        const oldLine = originalLine;
+        const newLine = `["${componentName}"]="${org}:${repo}:${newRef}:${sourcePath}"`;
 
         if (content.includes(oldLine)) {
             content = content.replace(oldLine, newLine);
             hasChanges = true;
-            if (updateInfo.logMessage) {
-                console.log(updateInfo.logMessage);
+            if (logMessage) {
+                console.log(logMessage);
             }
         } else {
-            console.log(`Warning: Could not find ${componentName} in manifest file`);
+            console.log(`Warning: Could not find component in manifest file (originalLine: ${oldLine})`);
         }
     }
 

.github/scripts/update-manifests-commit-sha.js

@@ -1,63 +1,66 @@
 const { getLatestCommitSha, parseManifestFile, updateManifestFile } = require('./manifest-utils');
 
 module.exports = async function ({ github, core }) {
-
   const manifestFile = 'get_all_manifests.sh';
-  const allComponents = parseManifestFile(manifestFile);
-
-  // Filter to only components with branch@sha format
-  const componentsWithSha = new Map();
-  for (const [componentName, componentInfo] of allComponents) {
-    if (!componentInfo.ref.includes('@')) {
-      continue;
-    }
-
-    const refParts = componentInfo.ref.split('@');
-    if (refParts.length !== 2) {
-      console.log(`⚠️  Skipping ${componentName}: invalid ref format "${componentInfo.ref}" (expected "branch@sha")`);
-      continue;
-    }
-
-    const [branchRef, commitSha] = refParts;
-    if (!branchRef || !commitSha) {
-      console.log(`⚠️  Skipping ${componentName}: empty branch or SHA in ref "${componentInfo.ref}"`);
-      continue;
+  const parsedManifests = parseManifestFile(manifestFile);
+
+  const updates = [];
+
+  // Process both ODH and RHOAI platforms
+  for (const components of [parsedManifests.odh, parsedManifests.rhoai]) {
+    // Filter to only components with branch@sha format
+    const componentsWithSha = [];
+    for (const componentInfo of components) {
+      if (!componentInfo.ref.includes('@')) {
+        continue;
+      }
+
+      const refParts = componentInfo.ref.split('@');
+      if (refParts.length !== 2) {
+        console.log(`⚠️  Skipping ${componentInfo.platform}:${componentInfo.componentName}: invalid ref format "${componentInfo.ref}" (expected "branch@sha")`);
+        continue;
+      }
+
+      const [branchRef, commitSha] = refParts;
+      if (!branchRef || !commitSha) {
+        console.log(`⚠️  Skipping ${componentInfo.platform}:${componentInfo.componentName}: empty branch or SHA in ref "${componentInfo.ref}"`);
+        continue;
+      }
+
+      componentsWithSha.push({
+        ...componentInfo,
+        branchRef,
+        commitSha
+      });
     }
 
-    componentsWithSha.set(componentName, {
-      ...componentInfo,
-      branchRef,
-      commitSha
-    });
-  }
-
-  console.log(`Found ${componentsWithSha.size} components with branch@sha format`);
+    console.log(`Found ${componentsWithSha.length} ${componentsWithSha.length > 0 ? componentsWithSha[0].platform.toUpperCase() : ''} components with branch@sha format`);
 
-  const updates = new Map();
+    for (const manifest of componentsWithSha) {
+      console.log(`Checking ${manifest.platform}:${manifest.componentName} (${manifest.org}/${manifest.repo}:${manifest.branchRef})...`);
 
-  for (const [componentName, manifest] of componentsWithSha) {
-    console.log(`Checking ${componentName} (${manifest.org}/${manifest.repo}:${manifest.branchRef})...`);
+      const latestSha = await getLatestCommitSha(github, manifest.org, manifest.repo, manifest.branchRef);
 
-    const latestSha = await getLatestCommitSha(github, manifest.org, manifest.repo, manifest.branchRef);
+      if (latestSha && latestSha !== manifest.commitSha) {
+        console.log(`Update needed for ${manifest.platform}:${manifest.componentName}: ${manifest.commitSha.substring(0, 8)} → ${latestSha.substring(0, 8)}`);
 
-    if (latestSha && latestSha !== manifest.commitSha) {
-      console.log(`Update needed for ${componentName}: ${manifest.commitSha.substring(0, 8)} → ${latestSha.substring(0, 8)}`);
-
-      updates.set(componentName, {
-        org: manifest.org,
-        repo: manifest.repo,
-        newRef: `${manifest.branchRef}@${latestSha}`,
-        sourcePath: manifest.sourcePath,
-        originalLine: manifest.originalLine,
-        logMessage: `✅ Updated ${componentName}: ${manifest.commitSha.substring(0, 8)} → ${latestSha.substring(0, 8)}`
-      });
-    } else {
-      console.log(`No update needed for ${componentName}`);
+        updates.push({
+          componentName: manifest.componentName,
+          org: manifest.org,
+          repo: manifest.repo,
+          newRef: `${manifest.branchRef}@${latestSha}`,
+          sourcePath: manifest.sourcePath,
+          originalLine: manifest.originalLine,
+          logMessage: `✅ Updated ${manifest.platform}:${manifest.componentName}: ${manifest.commitSha.substring(0, 8)} → ${latestSha.substring(0, 8)}`
+        });
+      } else {
+        console.log(`No update needed for ${manifest.platform}:${manifest.componentName}`);
+      }
     }
   }
 
   // Set outputs
-  const hasUpdates = updates.size > 0;
+  const hasUpdates = updates.length > 0;
   core.setOutput('updates-needed', hasUpdates);
 
   if (!hasUpdates) {
@@ -69,5 +72,5 @@ module.exports = async function ({ github, core }) {
   console.log('Updating manifest file...');
   updateManifestFile(manifestFile, updates);
 
-  console.log(`Successfully processed ${updates.size} manifest updates`);
+  console.log(`Successfully processed ${updates.length} manifest updates`);
 }

.github/scripts/update-manifests-tags.js

@@ -8,13 +8,16 @@ const { parseManifestFile, updateManifestFile } = require('./manifest-utils');
 module.exports = () => {
     const manifestFile = 'get_all_manifests.sh';
 
-    console.log('Updating component branches/tags...');
+    console.log('Updating component branches/tags for ODH...');
 
-    const manifestComponents = parseManifestFile(manifestFile);
+    const parsedManifests = parseManifestFile(manifestFile);
+
+    // Only process ODH components for this script
+    const manifestComponents = parsedManifests.odh;
 
     const specPrefix = 'component_spec_';
 
-    const updates = new Map();
+    const updates = [];
 
     for (const [key, value] of Object.entries(process.env)) {
         if (!key.startsWith(specPrefix)) {
@@ -30,31 +33,32 @@ module.exports = () => {
         const newRef = shaValue ? `${value}@${shaValue}` : value;
 
         let found = false;
-        for (const [manifestComponentName, componentInfo] of manifestComponents) {
+        for (const componentInfo of manifestComponents) {
             // Normalize both to dashes for comparison
             // get-release-branches.js uses: "/" -> "-", so we normalize everything to "-"
-            const normalizedManifest = manifestComponentName.toLowerCase().replace(/[\/\-_]/g, '-');
+            const normalizedManifest = componentInfo.componentName.toLowerCase().replace(/[\/\-_]/g, '-');
             const normalizedKey = componentKey.toLowerCase().replace(/[\/\-_]/g, '-');
 
             // Also try without workbenches prefix for special notebook-controller case
-            const normalizedManifestWithoutPrefix = manifestComponentName.toLowerCase()
+            const normalizedManifestWithoutPrefix = componentInfo.componentName.toLowerCase()
                 .replace(/^workbenches[\/\-]/, '')
                 .replace(/[\/\-_]/g, '-');
 
             if (normalizedManifest === normalizedKey ||
                 normalizedManifestWithoutPrefix === normalizedKey) {
                 const displayRef = shaValue ? `${value}@${shaValue.substring(0, 8)}` : value;
 
-                updates.set(manifestComponentName, {
+                updates.push({
+                    componentName: componentInfo.componentName,
                     org: orgValue || componentInfo.org,
                     repo: componentInfo.repo,
                     newRef: newRef,
                     sourcePath: componentInfo.sourcePath,
                     originalLine: componentInfo.originalLine,
-                    logMessage: `Updated ${manifestComponentName} to ${displayRef}`
+                    logMessage: `Updated ${componentInfo.platform}:${componentInfo.componentName} to ${displayRef}`
                 });
 
-                console.log(`  Updating ${manifestComponentName} to: ${displayRef}`);
+                console.log(`  Updating ${componentInfo.platform}:${componentInfo.componentName} to: ${displayRef}`);
                 found = true;
                 break;
             }

.github/scripts/update-versions.sh

@@ -4,10 +4,10 @@ set -euo
 
 NEW_VERSION=$1
 
-CURRENT_VERSION=$(cat Makefile | grep -w "VERSION ?=" | cut -d ' ' -f 3)
 CSV_FILE=config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml
-sed -i -e "s/^VERSION ?=.*/VERSION ?= $NEW_VERSION/g" Makefile
+# Only update the main VERSION variable inside the ifeq block, not other VERSION variables
+sed -i -e "/^ifeq.*VERSION/,/^endif/{s/[[:space:]]*VERSION = .*/\tVERSION = $NEW_VERSION/;}" Makefile
 sed -i -e "s|containerImage.*|containerImage: quay.io/opendatahub/opendatahub-operator:v$NEW_VERSION|g" $CSV_FILE
 sed -i -e "s|createdAt.*|createdAt: \"$(date +"%Y-%-m-%dT00:00:00Z")\"|g" $CSV_FILE
 sed -i -e "s|name: opendatahub-operator.v.*|name: opendatahub-operator.v$NEW_VERSION|g" $CSV_FILE
-sed -i -e "s|version: $CURRENT_VERSION.*|version: $NEW_VERSION|g" $CSV_FILE
+sed -i -e "s|version: [0-9][0-9.]*|version: $NEW_VERSION|g" $CSV_FILE

.github/workflows/ci-build-push-e2e-tests.yaml

@@ -35,25 +35,35 @@ jobs:
         with:
           go-version-file: go.mod
 
-      - name: Generate image tag
+      - name: Retrieve branch name
+        id: branch-name
+        uses: tj-actions/branch-names@5250492686b253f06fa55861556d1027b067aeb5
+
+      - name: Generate image tags
         id: image-tag
         run: |
           # tag based on shortened commit SHA
           COMMIT_SHA=$(echo ${{ github.sha }} | cut -c1-8)
-          echo "E2E_IMAGE_TAG=main-${COMMIT_SHA}" >> $GITHUB_OUTPUT
+          BRANCH_NAME=$(echo ${{ steps.branch-name.outputs.current_branch }})
+          echo "E2E_IMAGE_TAG="${BRANCH_NAME} >> $GITHUB_OUTPUT
+          echo "E2E_IMAGE_TAG_COMMIT=${BRANCH_NAME}-${COMMIT_SHA}" >> $GITHUB_OUTPUT
 
       - name: Build and push E2E test image
         env:
           E2E_IMAGE: ${{ env.E2E_IMAGE_TAG_BASE }}:${{ steps.image-tag.outputs.E2E_IMAGE_TAG }}
+          E2E_IMAGE_COMMIT: ${{ env.E2E_IMAGE_TAG_BASE }}:${{ steps.image-tag.outputs.E2E_IMAGE_TAG_COMMIT }}
         run: |
           echo "Building E2E test image: ${E2E_IMAGE}"
           podman build \
             --platform linux/amd64 \
             -f Dockerfiles/e2e-tests/e2e-tests.Dockerfile \
-            -t "${E2E_IMAGE}" \
+            -t "${E2E_IMAGE}" -t "${E2E_IMAGE_COMMIT}" \
             .
           
           echo "Pushing E2E test image: ${E2E_IMAGE}"
           podman push "${E2E_IMAGE}"
           
+          echo "Pushing E2E test image: ${E2E_IMAGE_COMMIT}"
+          podman push "${E2E_IMAGE_COMMIT}"
+          
           echo "E2E test image built and pushed successfully!"

.github/workflows/release-staging.yaml

@@ -53,7 +53,7 @@ jobs:
 
     - name: Clean up bundle files
       run: |
-        sed -i -e "s|image: quay.io/opendatahub/opendatahub-operator:latest.*|image: REPLACE_IMAGE:latest|g" bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
+        sed -i -e "s|image: quay.io/opendatahub/opendatahub-operator:latest.*|image: REPLACE_IMAGE:latest|g" odh-bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
         rm -f ./config/manager/kustomization.yaml
 
     - name: Update branches in get_all_manifest.sh
@@ -135,5 +135,5 @@ jobs:
           {
             "component": "opendatahub-operator",
             "release_branch": "odh-${{ env.VERSION }}",
-            "version": "v${{ env.VERSION }}"
+            "version": "${{ env.VERSION }}"
           }

.github/workflows/test-integration.yaml

@@ -6,7 +6,8 @@ on:
     branches:
       - main
     paths:
-      - 'bundle/**'
+      - 'odh-bundle/**'
+      - 'rhoai-bundle/**'
       - 'config/**'
       - 'Dockerfiles/**'
       - 'internal/**'

.github/workflows/test-prometheus-unit.yaml

@@ -2,8 +2,10 @@ name: Run prometheus unit tests
 on:
   pull_request:
     paths:
-      - 'config/monitoring/prometheus/**'
-      - 'tests/prometheus_unit_tests/**'
+      - 'internal/controller/components/**/monitoring/*-prometheusrules.tmpl.yaml'
+      - 'internal/controller/components/**/monitoring/*-alerting.unit-tests.yaml'
+      - 'tests/prometheus_unit_tests/scripts/**'
+      - 'Makefile'
 jobs:
   build:
     runs-on: ubuntu-latest