MGMT-22465: Merge the contents of master into releases/v2.17-cim

.ci-operator.yaml

@@ -0,0 +1,4 @@
+build_root_image:
+  name: release
+  namespace: openshift
+  tag: rhel-9-release-golang-1.24-openshift-4.21

.github/workflows/release.yaml

@@ -8,6 +8,10 @@ on:
 env:
   NODE_OPTIONS: '--max-old-space-size=8192'
 
+permissions:
+  id-token: write # Required for OIDC
+  contents: read
+
 jobs:
   publish-to-npm:
     runs-on: ubuntu-latest
@@ -21,7 +25,7 @@ jobs:
             exit 1
           fi
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.release.target_commitish }}
           fetch-depth: 0
@@ -42,15 +46,12 @@ jobs:
           echo "LIBS=${LIBS[@]}" >> $GITHUB_ENV
           (IFS=,; printf 'The following workspaces will be published: [%s]\n' "${LIBS[*]}")
 
-      - name: Configuring git
-        run: |
-          git config user.name '${{ github.actor }}'
-          git config user.email '${{ github.actor }}@users.noreply.github.com'
-
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           cache: yarn
           node-version: ${{ vars.NODEJS_VERSION }}
+          registry-url: 'https://registry.npmjs.org'
+          always-auth: true
 
       - name: Install dependencies
         run: yarn install --immutable
@@ -69,14 +70,17 @@ jobs:
       - name: Build
         run: yarn build:all
 
+      - name: Configure Yarn for npm registry
+        run: |
+          yarn config set npmRegistryServer https://registry.npmjs.org
+          yarn config set npmAlwaysAuth true
+          yarn config set npmAuthToken "${NODE_AUTH_TOKEN}"
+
       - name: Publish workspaces to NPM
-        env:
-          NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
         run: |
-          yarn config set npmScopes.openshift-assisted.npmAuthToken $NPM_AUTH_TOKEN
           for LIB in $(echo ${LIBS}); do
             printf 'Publishing @openshift-assisted/%s\n' "${LIB}"
-            yarn workspace @openshift-assisted/${LIB} npm publish
+            yarn workspace @openshift-assisted/${LIB} npm publish --access public
             # Verify the package has been published before publishing another one.
             until [[ "$(yarn npm info @openshift-assisted/${LIB} --fields version --json | jq -r '.version')" = "${GITHUB_REF_NAME:1}" ]]; do
               printf '@openshift-assisted/%s has not ben published yet\n' "${LIB}"

apps/assisted-disconnected-ui/Containerfile.ocp

@@ -1,23 +1,45 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.19 AS ui-build
-USER root
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.21 AS ui-build
+USER 0
 
 WORKDIR /app
-COPY --chown=1001:0 / /app
-RUN ls /app
+COPY --chown=1001:0 . /app
 ENV NODE_OPTIONS='--max-old-space-size=8192'
 RUN git config --global --add safe.directory /app
-RUN npm install -g corepack@0.24.1
-RUN yarn install --immutable && yarn build:all
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 as proxy-build
+# The REMOTE_SOURCES value is set by the build system to indicate the location of the cachito-backed artifacts cache.
+ARG REMOTE_SOURCES
+ARG REMOTE_SOURCES_DIR=/remote-sources
+COPY ${REMOTE_SOURCES} ${REMOTE_SOURCES_DIR}
+
+ARG YARN_VERSION=3.4.1
+
+# bootstrap yarn so we can install and run the other tools.
+RUN CACHED_YARN=./artifacts/${YARN_VERSION}.tar.gz; \
+    if [ -f ${CACHED_YARN} ]; then \
+      # use dependencies provided by Cachito
+      npm install -g ${CACHED_YARN}; \
+      yarn install --immutable && yarn build:all; \
+    else \
+      # For local builds
+      npm install -g corepack@0.24.1; \
+      corepack enable; \
+      corepack prepare yarn@${YARN_VERSION} --activate; \
+      yarn install --immutable && yarn build:all; \
+    fi
+
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS proxy-build
 WORKDIR /app
 COPY apps/assisted-disconnected-ui/proxy /app
 USER 0
-RUN go build
+# Build using vendored deps as build system does not have internet access
+RUN export GOFLAGS="-mod=vendor"; go build
+
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+
+LABEL io.openshift.release.operator=true
 
-FROM registry.ci.openshift.org/ocp/ubi-micro:9
 COPY --from=ui-build /app/apps/assisted-disconnected-ui/build /app/proxy/dist
 COPY --from=proxy-build /app/assisted-disconnected-ui /app/proxy
 WORKDIR /app/proxy
 EXPOSE 8080
-CMD ./assisted-disconnected-ui
+CMD ./assisted-disconnected-ui

apps/assisted-disconnected-ui/package.json

@@ -2,13 +2,13 @@
   "dependencies": {
     "@openshift-assisted/ui-lib": "workspace:*",
     "@openshift-console/dynamic-plugin-sdk": "0.0.3",
-    "@patternfly/patternfly": "5.2.0",
-    "@patternfly/react-code-editor": "5.2.0",
-    "@patternfly/react-core": "5.2.0",
-    "@patternfly/react-icons": "5.2.0",
-    "@patternfly/react-styles": "5.2.0",
-    "@patternfly/react-table": "5.2.0",
-    "@patternfly/react-tokens": "5.2.0",
+    "@patternfly/patternfly": "6.2.3",
+    "@patternfly/react-code-editor": "6.2.2",
+    "@patternfly/react-core": "6.2.2",
+    "@patternfly/react-icons": "6.2.2",
+    "@patternfly/react-styles": "6.2.2",
+    "@patternfly/react-table": "6.2.2",
+    "@patternfly/react-tokens": "6.2.2",
     "@reduxjs/toolkit": "^1.9.1",
     "@sentry/browser": "^7.119",
     "axios": ">=0.22.0 <2.0.0",
@@ -35,7 +35,7 @@
     "@vitejs/plugin-react-swc": "^3.0.1",
     "concurrently": "^8.2.2",
     "nodemon": "^3.0.3",
-    "vite": "^5.4.20",
+    "vite": "^5.4.21",
     "vite-plugin-environment": "^1.1.3"
   },
   "overrides": {

apps/assisted-disconnected-ui/src/components/App.tsx

@@ -1,6 +1,13 @@
 import * as React from 'react';
 import { BrowserRouter, Routes, Route } from 'react-router-dom-v5-compat';
-import { Brand, Masthead, MastheadBrand, MastheadMain, Page } from '@patternfly/react-core';
+import {
+  Brand,
+  Masthead,
+  MastheadLogo,
+  MastheadMain,
+  MastheadBrand,
+  Page,
+} from '@patternfly/react-core';
 import { Provider } from 'react-redux';
 import { Store, useFeatureDetection } from '@openshift-assisted/ui-lib/ocm';
 import { FeatureListType } from '@openshift-assisted/ui-lib/lib/common';
@@ -28,13 +35,15 @@ export const App: React.FC = () => {
     <Masthead id="masthead">
       <MastheadMain>
         <MastheadBrand>
-          <Brand
-            src="/logo.svg"
-            alt="OpenShift Container Platform Assisted Installer"
-            style={{ width: '188px' }}
-          >
-            <source src="/logo.svg" />
-          </Brand>
+          <MastheadLogo>
+            <Brand
+              src="/logo.svg"
+              alt="OpenShift Container Platform Assisted Installer"
+              style={{ width: '188px' }}
+            >
+              <source src="/logo.svg" />
+            </Brand>
+          </MastheadLogo>
         </MastheadBrand>
       </MastheadMain>
     </Masthead>
@@ -43,7 +52,7 @@ export const App: React.FC = () => {
   return (
     <BrowserRouter>
       <Provider store={Store.storeDay1}>
-        <Page header={header} isManagedSidebar defaultManagedSidebarIsOpen={false}>
+        <Page masthead={header} isManagedSidebar defaultManagedSidebarIsOpen={false}>
           <AppRouter />
         </Page>
       </Provider>

apps/assisted-disconnected-ui/src/components/CreateClusterWizard.tsx

@@ -8,7 +8,7 @@ import {
   NewClusterWizard,
   ModalDialogsContextProvider,
 } from '@openshift-assisted/ui-lib/ocm';
-import { Alert, PageSection, PageSectionVariants } from '@patternfly/react-core';
+import { Alert, PageSection } from '@patternfly/react-core';
 import { useNavigate } from 'react-router-dom-v5-compat';
 import ResetSingleClusterModal from './ResetSingleClusterModal';
 
@@ -21,7 +21,7 @@ const CreateClusterWizard = () => {
 
   if (error) {
     return (
-      <PageSection variant={PageSectionVariants.light} isFilled>
+      <PageSection hasBodyWrapper={false} isFilled>
         <Alert isInline variant="danger" title="Failed to fetch clusters" />
       </PageSection>
     );

apps/assisted-disconnected-ui/src/components/ResetSingleClusterModal.tsx

@@ -1,15 +1,6 @@
 import React from 'react';
-import {
-  Button,
-  Modal,
-  ModalVariant,
-  ButtonVariant,
-  Text,
-  TextContent,
-  Stack,
-  StackItem,
-  Alert,
-} from '@patternfly/react-core';
+import { Button, ButtonVariant, Content, Stack, StackItem, Alert } from '@patternfly/react-core';
+import { Modal, ModalVariant } from '@patternfly/react-core/deprecated';
 import { useModalDialogsContext, ClustersService } from '@openshift-assisted/ui-lib/ocm';
 import {
   getApiErrorMessage,
@@ -80,13 +71,13 @@ const ResetSingleClusterModal: React.FC = () => {
     >
       <Stack hasGutter>
         <StackItem>
-          <TextContent>
-            <Text component="p">
+          <Content>
+            <Content component="p">
               {t('ai:This will remove all current configurations and will revert to the defaults.')}
-            </Text>
+            </Content>
 
-            <Text component="p">{t('ai:Are you sure you want to reset the cluster?')}</Text>
-          </TextContent>
+            <Content component="p">{t('ai:Are you sure you want to reset the cluster?')}</Content>
+          </Content>
         </StackItem>
         {error && (
           <StackItem>

apps/assisted-disconnected-ui/src/components/SingleClusterFinalizerPage.tsx

@@ -4,9 +4,7 @@ import {
   EmptyState,
   EmptyStateBody,
   EmptyStateFooter,
-  EmptyStateHeader,
   EmptyStateVariant,
-  Spinner,
 } from '@patternfly/react-core';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import {
@@ -24,12 +22,7 @@ const SingleClusterFinalizerPage = ({
   const { t } = useTranslation();
   return (
     <Bullseye>
-      <EmptyState variant={EmptyStateVariant.xl}>
-        <EmptyStateHeader
-          titleText={t('ai:Finalizing')}
-          headingLevel="h4"
-          icon={<Spinner size="xl" />}
-        />
+      <EmptyState headingLevel="h4" titleText={t('ai:Finalizing')} variant={EmptyStateVariant.xl}>
         <EmptyStateBody>
           {t('ai:Cluster installation is still in-progress.')}
           <br />

apps/assisted-ui/package.json

@@ -6,13 +6,13 @@
     "@patternfly-6/patternfly": "npm:@patternfly/patternfly@6.3.1",
     "@patternfly-6/react-core": "npm:@patternfly/react-core@6.3.1",
     "@patternfly/chatbot": "6.4.0-prerelease.4",
-    "@patternfly/patternfly": "5.2.0",
-    "@patternfly/react-code-editor": "5.2.0",
-    "@patternfly/react-core": "5.2.0",
-    "@patternfly/react-icons": "5.2.0",
-    "@patternfly/react-styles": "5.2.0",
-    "@patternfly/react-table": "5.2.0",
-    "@patternfly/react-tokens": "5.2.0",
+    "@patternfly/patternfly": "6.2.3",
+    "@patternfly/react-code-editor": "6.2.2",
+    "@patternfly/react-core": "6.2.2",
+    "@patternfly/react-icons": "6.2.2",
+    "@patternfly/react-styles": "6.2.2",
+    "@patternfly/react-table": "6.2.2",
+    "@patternfly/react-tokens": "6.2.2",
     "@reduxjs/toolkit": "^1.9.1",
     "@sentry/browser": "^7.119",
     "axios": ">=0.22.0 <2.0.0",
@@ -37,7 +37,7 @@
     "@tsconfig/vite-react": "^1.0.1",
     "@types/react": "17.0.x",
     "@vitejs/plugin-react-swc": "^3.0.1",
-    "vite": "^5.4.20",
+    "vite": "^5.4.21",
     "vite-plugin-environment": "^1.1.3"
   },
   "overrides": {

apps/assisted-ui/src/components/AboutModal.tsx

@@ -1,6 +1,6 @@
 import type React from 'react';
 import { useCallback, useEffect, useState } from 'react';
-import { AboutModal as PFAboutModal, TextContent } from '@patternfly/react-core';
+import { AboutModal as PFAboutModal } from '@patternfly/react-core';
 import { GIT_SHA, VERSION, SERVICE_LABELS, IMAGE_REPO } from '../config';
 import redHatLogo from '/logo.svg';
 import { Services, Api, Constants, DetailList, DetailItem } from '@openshift-assisted/ui-lib/ocm';
@@ -64,36 +64,34 @@ export const AboutModal: React.FC<AboutModalProps> = ({ isOpen, onClose }) => {
       brandImageSrc={redHatLogo}
       brandImageAlt="Assisted Installer Logo"
     >
-      <TextContent>
-        <DetailList>
-          <>
-            {releaseTag && <DetailItem title="Release tag" value={releaseTag} />}
-            <DetailItem
-              title="Assisted Installer UI version"
-              value={getUIVersion()}
-              idPrefix="ui-lib-version"
-            />
-            <DetailItem
-              title="Assisted Installer UI library version"
-              value={Constants.getAssistedUiLibVersion()}
-            />
-            {Object.keys(versions || {}).map((key) => {
-              const version = versions ? versions[key] : '';
-              return (
-                <DetailItem
-                  key={key}
-                  title={SERVICE_LABELS[key] || key}
-                  value={
-                    <a target="_blank" rel="noopener noreferrer" href={`https://${version}`}>
-                      {version}
-                    </a>
-                  }
-                />
-              );
-            })}
-          </>
-        </DetailList>
-      </TextContent>
+      <DetailList>
+        <>
+          {releaseTag && <DetailItem title="Release tag" value={releaseTag} />}
+          <DetailItem
+            title="Assisted Installer UI version"
+            value={getUIVersion()}
+            idPrefix="ui-lib-version"
+          />
+          <DetailItem
+            title="Assisted Installer UI library version"
+            value={Constants.getAssistedUiLibVersion()}
+          />
+          {Object.keys(versions || {}).map((key) => {
+            const version = versions ? versions[key] : '';
+            return (
+              <DetailItem
+                key={key}
+                title={SERVICE_LABELS[key] || key}
+                value={
+                  <a target="_blank" rel="noopener noreferrer" href={`https://${version}`}>
+                    {version}
+                  </a>
+                }
+              />
+            );
+          })}
+        </>
+      </DetailList>
     </PFAboutModal>
   );
 };

apps/assisted-ui/src/components/App.tsx

@@ -13,7 +13,7 @@ window.__app__ = { OCM };
 export const App: React.FC = () => (
   <BrowserRouter basename={Config.routeBasePath}>
     <CompatRouter>
-      <Page header={<Header />} isManagedSidebar defaultManagedSidebarIsOpen={false}>
+      <Page masthead={<Header />} isManagedSidebar defaultManagedSidebarIsOpen={false}>
         <UILibRoutes
           allEnabledFeatures={Features.STANDALONE_DEPLOYMENT_ENABLED_FEATURES}
           additionalComponents={refreshToken ? <ChatBot /> : undefined}