Merge pull request #2129 from Gkrumbach07/updateEdge

Update edge

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -23,7 +23,7 @@ body:
       options:
         - OpenDataHub core version (eg. `v1.6.0`)
         - Installing Dashboard directly (eg. `v2.12.0`, `commit xyz`, `branch name`)
-        - Downstream version (eg. `RHODS 1.29`)
+        - Downstream version (eg. `OpenShift AI 2.4`)
     validations:
       required: true
   - type: input
@@ -32,7 +32,7 @@ body:
       label: Version
       description: |
         What was the version this was found on?
-        
+
         eg. a branch name, a commit id, or a version number
     validations:
       required: true

.github/workflows/pull_request.yml

@@ -1,8 +1,6 @@
 name: Pull request
 on:
   pull_request:
-    branches: [ main, f/** ]
-
 jobs:
   Tests:
     runs-on: ubuntu-latest

backend/src/routes/api/namespaces/namespaceUtils.ts

@@ -65,7 +65,6 @@ export const applyNamespaceChange = async (
     case NamespaceApplicationCase.DSG_CREATION:
       labels = {
         'opendatahub.io/dashboard': 'true',
-        'modelmesh-enabled': 'true',
       };
       break;
     case NamespaceApplicationCase.MODEL_SERVING_PROMOTION:

docs/process-definition/branches.md

@@ -17,7 +17,7 @@ There are really two types of branches.
   - Core branches (like `main` and `incubation`)
   - [Bot branches](#bot-branches)
 
-Every _new_ commit needs to come from a fork through a PR. We don't allow for pushing new content directly through our flows. New docs file, new code change, and even fixing a typo needs a PR from your fork to get into our repository.
+Every _new_ commit needs to come from a fork through a PR. We don't allow for pushing new content directly through our flows. New docs file, new code change, and even fixing a typo needs a PR from your fork to get into our repository. This ensures automated tests pass before the change is merged.
 
 With that said, there are really 3 types of flows that utilize both fork branches and Upstream branches.
 
@@ -33,6 +33,19 @@ There is only ever 1 `main` and 1 `incubation` branch. Feature branches start wi
 
 Read more on git tags & releases in our [release documentation].
 
+## Merging upstream branches 
+
+Understanding the commit history on an upstream branch is important. Therefore when merging an upstream branch into another, your PR branch must follow the pattern `merge-<source branch nam>`.
+
+For example when merging `f/some-feature` into `incubation`, name your branch `merge-f/some-feature`. This will result in a commit message on the `incubation` branch of `Merge pull request # from <username>/merge-f/some-feature` when the PR is merged.
+
+Use the following steps to create a PR when merging upstream branches:
+
+- `git checkout -b merge-<source-branch> <target-branch>`
+- `git pull --no-rebase upstream <source-branch>`
+- Resolve all conflicts then post a PR.
+- If the target branch is `main`, wait for the PR to be approved. For all other target branches, apply the `approved` and `lgtm` labels to the PR once all checks pass.
+
 ## Main
 
 > aka "The Stable Branch"

docs/process-definition/releases.md

@@ -25,7 +25,7 @@ There are two types of releases:
 
 ### Release of `main`
 
-Every 3 weeks we release on a Friday. This is useful for any downstream products (like RHODS) to use our stable code.
+Every 3 weeks we release on a Friday. This is useful for any downstream products (like Red Hat OpenShift AI) to use our stable code.
 
 ODH & other "bleeding edge" implementations may want to consider using `incubation`. Read more on [incubation].
 

frontend/.env

@@ -1,7 +1,7 @@
 ODH_IS_PROJECT_ROOT_DIR=false
 ODH_PORT=${FRONTEND_PORT}
 
-########## Change the following three variables for ODH/RHODS ##########
+########## Change the following three variables for ODH/OpenShift AI ##########
 ODH_LOGO=odh-logo.svg
 ODH_PRODUCT_NAME=Open Data Hub
 ODH_FAVICON=odh-favicon.svg

frontend/.eslintrc

@@ -69,6 +69,10 @@
             "group": ["~/components/table/**", "!~/components/table/useTableColumnSort"],
             "message": "Read from '~/components/table' instead."
           },
+          {
+            "group": ["~/concepts/area/**"],
+            "message": "Read from '~/concepts/area' instead."
+          },
           {
             "group": ["~/components/table/useTableColumnSort"],
             "message": "The data will be sorted in the table, don't use this hook outside of '~/components/table' repo. For more information, please check the props of the Table component."

frontend/src/__mocks__/mockDashboardConfig.ts

@@ -1,5 +1,4 @@
-import { DashboardConfig } from '~/types';
-import { KnownLabels } from '~/k8sTypes';
+import { DashboardConfigKind, KnownLabels } from '~/k8sTypes';
 
 type MockDashboardConfigType = {
   disableInfo?: boolean;
@@ -11,6 +10,7 @@ type MockDashboardConfigType = {
   disableAppLauncher?: boolean;
   disableUserManagement?: boolean;
   disableProjects?: boolean;
+  disablePipelines?: boolean;
   disableModelServing?: boolean;
   disableCustomServingRuntimes?: boolean;
 };
@@ -27,7 +27,8 @@ export const mockDashboardConfig = ({
   disableProjects = false,
   disableModelServing = false,
   disableCustomServingRuntimes = false,
-}: MockDashboardConfigType): DashboardConfig => ({
+  disablePipelines = false,
+}: MockDashboardConfigType): DashboardConfigKind => ({
   apiVersion: 'opendatahub.io/v1alpha',
   kind: 'OdhDashboardConfig',
   metadata: {
@@ -51,21 +52,21 @@ export const mockDashboardConfig = ({
       disableProjects,
       disableModelServing,
       disableCustomServingRuntimes,
+      disablePipelines,
       modelMetricsNamespace: 'test-project',
-      disablePipelines: false,
       disableProjectSharing: false,
     },
     notebookController: {
       enabled: true,
-      notebookNamespace: 'rhods-notebooks',
+      notebookNamespace: 'openshift-ai-notebooks',
       notebookTolerationSettings: {
         enabled: true,
         key: 'NotebooksOnlyChange',
       },
       pvcSize: '20Gi',
     },
     groupsConfig: {
-      adminGroups: 'rhods-admins',
+      adminGroups: 'openshift-ai-admins',
       allowedGroups: 'system:authenticated',
     },
     modelServerSizes: [

frontend/src/__mocks__/mockDscStatus.ts

@@ -0,0 +1,20 @@
+import { DataScienceClusterKindStatus } from '~/k8sTypes';
+import { StackComponent } from '~/concepts/areas/types';
+
+type MockDscStatus = {
+  installedComponents?: DataScienceClusterKindStatus['installedComponents'];
+};
+
+export const mockDscStatus = ({
+  installedComponents,
+}: MockDscStatus): DataScienceClusterKindStatus => ({
+  conditions: [],
+  installedComponents: Object.values(StackComponent).reduce(
+    (acc, component) => ({
+      ...acc,
+      [component]: installedComponents?.[component] ?? false,
+    }),
+    {},
+  ),
+  phase: 'Ready',
+});

frontend/src/__mocks__/mockImageStreamK8sResource.ts

@@ -0,0 +1,84 @@
+import _ from 'lodash';
+import { ImageStreamKind } from '~/k8sTypes';
+import { RecursivePartial } from '~/typeHelpers';
+
+type MockResourceConfigType = {
+  name?: string;
+  namespace?: string;
+  displayName?: string;
+  opts?: RecursivePartial<ImageStreamKind>;
+};
+
+export const mockImageStreamK8sResource = ({
+  name = 'test-imagestream',
+  namespace = 'test-project',
+  displayName = 'Test Image',
+  opts = {},
+}: MockResourceConfigType): ImageStreamKind =>
+  _.merge(
+    {
+      apiVersion: 'image.openshift.io/v1',
+      kind: 'ImageStream',
+      metadata: {
+        name: name,
+        namespace: namespace,
+        uid: 'd6a75af7-f215-47d1-a167-e1c1e78d465c',
+        resourceVersion: '1579802',
+        generation: 2,
+        creationTimestamp: '2023-06-30T15:07:35Z',
+        labels: {
+          'component.opendatahub.io/name': 'notebooks',
+          'opendatahub.io/component': 'true',
+          'opendatahub.io/notebook-image': 'true',
+        },
+        annotations: {
+          'kfctl.kubeflow.io/kfdef-instance': 'opendatahub.opendatahub',
+          'opendatahub.io/notebook-image-desc':
+            'Jupyter notebook image with minimal dependency set to start experimenting with Jupyter environment.',
+          'opendatahub.io/notebook-image-name': displayName,
+          'opendatahub.io/notebook-image-order': '1',
+          'opendatahub.io/notebook-image-url':
+            'https://github.com//opendatahub-io/notebooks/tree/main/jupyter/minimal',
+          'openshift.io/image.dockerRepositoryCheck': '2023-06-30T15:07:36Z',
+        },
+      },
+      spec: {
+        lookupPolicy: {
+          local: true,
+        },
+        tags: [
+          {
+            name: '1.2',
+            annotations: {
+              'opendatahub.io/notebook-python-dependencies':
+                '[{"name":"JupyterLab","version": "3.2"}, {"name": "Notebook","version": "6.4"}]',
+              'opendatahub.io/notebook-software': '[{"name":"Python","version":"v3.8"}]',
+            },
+            from: {
+              kind: 'DockerImage',
+              name: 'quay.io/opendatahub/notebooks@sha256:a138838e1c9acd7708462e420bf939e03296b97e9cf6c0aa0fd9a5d20361ab75',
+            },
+          },
+        ],
+      },
+      status: {
+        dockerImageRepository:
+          'image-registry.openshift-image-registry.svc:5000/opendatahub/jupyter-minimal-notebook',
+        tags: [
+          {
+            tag: '1.2',
+            items: [
+              {
+                created: '2023-06-30T15:07:36Z',
+                dockerImageReference:
+                  'quay.io/opendatahub/notebooks@sha256:a138838e1c9acd7708462e420bf939e03296b97e9cf6c0aa0fd9a5d20361ab75',
+                image: 'sha256:a138838e1c9acd7708462e420bf939e03296b97e9cf6c0aa0fd9a5d20361ab75',
+                generation: 2,
+              },
+            ],
+          },
+        ],
+      },
+    } as ImageStreamKind,
+    opts,
+  );