Merge pull request #1046 from PeterYurkovich/merge-main-to-alerts-management

NO-JIRA: merge main back in

Author: openshift-merge-bot[bot]

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.25-openshift-4.22
+  tag: rhel-9-release-golang-1.26-openshift-5.0

.coderabbit.yaml

@@ -1,3 +1,6 @@
 inheritance: true
 reviews:
   review_status: false
+  auto_review:
+    base_branches:
+      - main-alerts-management-api

.gitignore

@@ -14,4 +14,5 @@ dist/
 .devspace
 web/po-files/
 .claude/commands/configs
+.claude/settings.local.json
 _output/

AGENTS.md

@@ -283,6 +283,53 @@ npm run cypress:open
 
 For detailed testing instructions, see `web/cypress/CYPRESS_TESTING_GUIDE.md`
 
+### Cypress Component Testing
+
+#### Overview
+
+Cypress component tests mount individual React components in isolation, without requiring a running OpenShift cluster. They are useful for testing component rendering, user interactions, and visual behavior with fast feedback.
+
+- **Test location**: `web/cypress/component/`
+- **Support file**: `web/cypress/support/component.ts`
+- **Config**: `component` section in `web/cypress.config.ts`
+
+#### When to Create Component Tests
+
+- Testing a component's rendering logic (conditional display, empty states)
+- Verifying props are handled correctly
+- Validating user interactions within a single component
+- When E2E tests would be overkill for the behavior under test
+
+#### Quick Test Commands
+
+```bash
+cd web
+
+# Interactive mode
+npm run cypress:open:component
+
+# Headless mode - all component tests
+npm run cypress:run:component
+
+# Run a single component test file
+npx cypress run --component --spec cypress/component/labels.cy.tsx
+```
+
+#### Writing a Component Test
+
+Component test files use the `.cy.tsx` extension and go in `web/cypress/component/`:
+
+```typescript
+import { MyComponent } from '../../src/components/MyComponent';
+
+describe('MyComponent', () => {
+  it('renders correctly', () => {
+    cy.mount(<MyComponent prop="value" />);
+    cy.contains('expected text').should('be.visible');
+  });
+});
+```
+
 ### Release Pipeline:
 
 - **Konflux**: Handles CI/CD and release automation

CONTRIBUTING.md

@@ -411,6 +411,23 @@ cd web/cypress
 npm run cypress:run --spec "cypress/e2e/**/regression/**"
 ```
 
+### Component Tests (Cypress)
+
+For testing individual React components in isolation (no cluster required):
+
+- Test files: `web/cypress/component/` (`.cy.tsx` extension)
+- Support file: `web/cypress/support/component.ts`
+
+```bash
+cd web
+
+# Interactive mode
+npm run cypress:open:component
+
+# Headless mode
+npm run cypress:run:component
+```
+
 ---
 
 ## Internationalization (i18n)

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.19 AS web-builder
+FROM registry.redhat.io/ubi9/nodejs-22:latest AS web-builder
 
 WORKDIR /opt/app-root
 
@@ -8,12 +8,12 @@ ENV HUSKY=0
 
 COPY web/package.json web/package-lock.json web/
 COPY Makefile Makefile
-RUN make install-frontend
+RUN make install-frontend-ci
 
 COPY web/ web/
 RUN make build-frontend
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 as go-builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.26 AS go-builder
 
 WORKDIR /opt/app-root
 
@@ -32,7 +32,7 @@ ENV CGO_ENABLED=1
 
 RUN make build-backend BUILD_OPTS="-tags strictfipsruntime"
 
-FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
+FROM registry.access.redhat.com/ubi9/ubi-minimal
 
 USER 1001
 

Dockerfile.art

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.22 AS web-builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-5.0 AS web-builder
 
 # Copy app sources
 COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
@@ -12,7 +12,7 @@ ENV HUSKY=0
 ENV CYPRESS_INSTALL_BINARY=0
 RUN make install-frontend-ci && make build-frontend
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS go-builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS go-builder
 
 COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
 WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app
@@ -23,7 +23,7 @@ ENV CGO_ENABLED=1
 RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env \
   && make build-backend BUILD_OPTS="-tags strictfipsruntime"
 
-FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
+FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
 
 USER 1001
 

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/nodejs-22:9.6-1755075210 AS web-builder
+FROM registry.redhat.io/ubi9/nodejs-22:latest AS web-builder
 
 WORKDIR /opt/app-root
 
@@ -13,10 +13,7 @@ RUN make install-frontend-ci
 COPY web/ web/
 RUN make build-frontend
 
-# Almost all images from Red Hat are still on go1.21, however I found one that the cne team has
-# created. Once official Red Hat images are available for local development and pulling this
-# should be updated
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as go-builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.26 AS go-builder
 
 WORKDIR /opt/app-root
 

Dockerfile.dev-mcp

@@ -16,10 +16,10 @@ RUN make update-plugin-name
 
 ENV I18N_NAMESPACE="plugin__monitoring-console-plugin"
 
-RUN make install-frontend
+RUN make install-frontend-ci
 RUN make build-frontend
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as go-builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.25 AS go-builder
 
 WORKDIR /opt/app-root
 

Dockerfile.mcp

@@ -16,7 +16,7 @@ RUN make update-plugin-name
 ENV I18N_NAMESPACE="plugin__monitoring-console-plugin"
 RUN make build-frontend
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24 as go-builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.26 AS go-builder
 
 WORKDIR /opt/app-root
 
@@ -38,7 +38,7 @@ ENV CGO_ENABLED=1
 
 RUN make build-backend
 
-FROM registry.redhat.io/rhel9-4-els/rhel:9.4
+FROM registry.access.redhat.com/ubi9/ubi-minimal
 
 RUN mkdir /licenses
 COPY LICENSE /licenses/.