Merge remote-tracking branch 'upstream/main' into jonburdo-20260422-sync

Signed-off-by: Jon Burdo <jon@jonburdo.com>

Author: jonburdo

.github/workflows/go-mod-tidy-diff-check.yml

@@ -24,7 +24,7 @@ jobs:
                   go-version: "1.25.7"
 
             - name: Cache Go modules
-              uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
+              uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
               with:
                   path: ~/go/pkg/mod
                   key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

catalog/clients/python/patches/include-readonly-timestamps.patch

@@ -0,0 +1,14 @@
+--- a/catalog/clients/python/src/catalog_openapi/models/catalog_model.py
++++ b/catalog/clients/python/src/catalog_openapi/models/catalog_model.py
+@@ -79,10 +79,7 @@
+         * OpenAPI `readOnly` fields are excluded.
+         * OpenAPI `readOnly` fields are excluded.
+         """
+-        excluded_fields: Set[str] = set([
+-            "create_time_since_epoch",
+-            "last_update_time_since_epoch",
+-        ])
++        excluded_fields: Set[str] = set([])
+
+         _dict = self.model_dump(
+             by_alias=True,

clients/ui/bff/go.mod

@@ -12,8 +12,8 @@ require (
 	github.com/rs/cors v1.11.1
 	github.com/stretchr/testify v1.11.1
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.35.3
-	k8s.io/apimachinery v0.35.3
+	k8s.io/api v0.35.4
+	k8s.io/apimachinery v0.35.4
 	k8s.io/client-go v0.35.3
 	sigs.k8s.io/controller-runtime v0.23.3
 )

clients/ui/bff/go.sum

@@ -153,12 +153,12 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.35.3 h1:pA2fiBc6+N9PDf7SAiluKGEBuScsTzd2uYBkA5RzNWQ=
-k8s.io/api v0.35.3/go.mod h1:9Y9tkBcFwKNq2sxwZTQh1Njh9qHl81D0As56tu42GA4=
+k8s.io/api v0.35.4 h1:P7nFYKl5vo9AGUp1Z+Pmd3p2tA7bX2wbFWCvDeRv988=
+k8s.io/api v0.35.4/go.mod h1:yl4lqySWOgYJJf9RERXKUwE9g2y+CkuwG+xmcOK8wXU=
 k8s.io/apiextensions-apiserver v0.35.0 h1:3xHk2rTOdWXXJM+RDQZJvdx0yEOgC0FgQ1PlJatA5T4=
 k8s.io/apiextensions-apiserver v0.35.0/go.mod h1:E1Ahk9SADaLQ4qtzYFkwUqusXTcaV2uw3l14aqpL2LU=
-k8s.io/apimachinery v0.35.3 h1:MeaUwQCV3tjKP4bcwWGgZ/cp/vpsRnQzqO6J6tJyoF8=
-k8s.io/apimachinery v0.35.3/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
+k8s.io/apimachinery v0.35.4 h1:xtdom9RG7e+yDp71uoXoJDWEE2eOiHgeO4GdBzwWpds=
+k8s.io/apimachinery v0.35.4/go.mod h1:NNi1taPOpep0jOj+oRha3mBJPqvi0hGdaV8TCqGQ+cc=
 k8s.io/client-go v0.35.3 h1:s1lZbpN4uI6IxeTM2cpdtrwHcSOBML1ODNTCCfsP1pg=
 k8s.io/client-go v0.35.3/go.mod h1:RzoXkc0mzpWIDvBrRnD+VlfXP+lRzqQjCmKtiwZ8Q9c=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

clients/ui/bff/internal/integrations/kubernetes/client.go

@@ -12,7 +12,7 @@ const ComponentLabelValue = "model-registry"
 const ComponentLabelValueCatalog = "model-catalog"
 
 const CatalogSourceKey = "sources.yaml"
-const CatalogSourceDefaultConfigMapName = "model-catalog-default-sources"
+const CatalogSourceDefaultConfigMapName = "default-catalog-sources"
 const CatalogSourceUserConfigMapName = "model-catalog-sources"
 
 type KubernetesClientInterface interface {

clients/ui/bff/internal/integrations/kubernetes/k8mocks/base_testenv.go

@@ -347,7 +347,7 @@ catalogs:
 	}
 
 	if _, err := k8sClient.CoreV1().ConfigMaps(namespace).Create(ctx, cm, metav1.CreateOptions{}); err != nil {
-		return fmt.Errorf("failed to create model-catalog-default-sources configmap: %w", err)
+		return fmt.Errorf("failed to create default-catalog-sources configmap: %w", err)
 	}
 
 	return nil

clients/ui/frontend/src/__mocks__/mockCatalogSourceList.ts

@@ -56,6 +56,25 @@ export const mockCatalogSourceActive = (): CatalogSource => ({
   status: 'available',
 });
 
+export const mockTwoProviderSources = (): CatalogSource[] => [
+  mockCatalogSource({ labels: ['Provider one'] }),
+  mockCatalogSource({
+    id: 'source-2',
+    name: 'Provider Two Source',
+    labels: ['Provider two'],
+  }),
+];
+
+export const mockProviderAndCustomSources = (): CatalogSource[] => [
+  mockCatalogSource({ labels: ['Provider one'] }),
+  mockCatalogSource({ id: 'custom-source', name: 'Custom Source', labels: [] }),
+];
+
+export const mockDefaultSources = (): CatalogSource[] => [
+  mockCatalogSource({}),
+  mockCatalogSource({ id: 'source-2', name: 'source 2' }),
+];
+
 export const mockCatalogSourceList = (partial?: Partial<CatalogSourceList>): CatalogSourceList => ({
   items: [
     mockCatalogSourceActive(),

clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelCatalog.ts

@@ -168,6 +168,10 @@ class ModelCatalog {
     return cy.findByTestId('model-long-description');
   }
 
+  findModelCardMarkdown() {
+    return cy.findByTestId('model-card-markdown');
+  }
+
   findModelArchitecture() {
     return cy.findByTestId('model-architecture');
   }

clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelCatalogSettings.ts

@@ -97,7 +97,7 @@ class CatalogSourceConfigRow extends TableRow {
     return this;
   }
 
-  shouldHaveValidationStatus(status: 'Connected' | 'Failed' | 'Starting' | 'Unknown' | '-') {
+  shouldHaveValidationStatus(status: 'Ready' | 'Failed' | 'Starting' | 'Unknown' | '-') {
     this.findValidationStatus().contains(status);
     return this;
   }

clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelTransferJobs.ts

@@ -4,6 +4,18 @@ class ModelTransferJobsTableRow extends TableRow {
   findJobName() {
     return this.find().findByTestId('job-name');
   }
+
+  findStatus() {
+    return this.find().findByTestId('job-status');
+  }
+
+  findErrorMessage() {
+    return this.find().findByTestId('job-error-message');
+  }
+
+  findRetryButton() {
+    return this.find().findByTestId('job-retry-button');
+  }
 }
 
 class ModelTransferJobsPage {
@@ -57,6 +69,14 @@ class ModelTransferJobsPage {
   findEmptyState() {
     return cy.findByTestId('empty-model-transfer-jobs');
   }
+
+  findRetryModal() {
+    return cy.findByTestId('retry-job-modal');
+  }
+
+  findRetryModalSubmitButton() {
+    return this.findRetryModal().findByTestId('retry-job-submit-button');
+  }
 }
 
 export const modelTransferJobsPage = new ModelTransferJobsPage();