From 1a703aa11b95fc7605e3432c0c2fcab292902c96 Mon Sep 17 00:00:00 2001 From: Sergey Yedrikov Date: Thu, 8 Jan 2026 12:42:18 -0500 Subject: [PATCH] OLS-2321: remove lightspeed-console from Prow CI --- Makefile | 8 ++++---- bundle.Dockerfile | 10 +++++----- ...tspeed-operator.clusterserviceversion.yaml | 20 +++++++++---------- config/default/kustomization.yaml | 10 +++++----- hack/template_bundle.Containerfile | 10 +++++----- hack/update_bundle.sh | 20 +++++++++++-------- internal/controller/utils/constants.go | 8 ++++---- 7 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Makefile b/Makefile index 64c8e9d4e..332fc7165 100644 --- a/Makefile +++ b/Makefile @@ -209,10 +209,10 @@ build: manifests generate fmt vet ## Build manager binary. LIGHTSPEED_SERVICE_IMG ?= quay.io/openshift-lightspeed/lightspeed-service-api:latest LIGHTSPEED_SERVICE_POSTGRES_IMG ?= registry.redhat.io/rhel9/postgresql-16@sha256:42f385ac3c9b8913426da7c57e70bc6617cd237aaf697c667f6385a8c0b0118b -CONSOLE_PLUGIN_IMG ?= quay.io/openshift-lightspeed/lightspeed-console-plugin:latest -OPENSHIFT_MCP_SERVER_IMG ?= quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43 -DATAVERSE_EXPORTER_IMG ?= quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722 -OCP_RAG_IMG ?= quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag@sha256:db6349fd04308a05e803e00b0ed38249a84c5f0f294a1e95b49b9ac010f516ec +CONSOLE_PLUGIN_IMG ?= quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console:latest +OPENSHIFT_MCP_SERVER_IMG ?= quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server:latest +DATAVERSE_EXPORTER_IMG ?= quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter:latest +OCP_RAG_IMG ?= quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag:latest .PHONY: dev-setup dev-setup: manifests kustomize install ## Setup RBAC and resources for local development (idempotent, safe to run multiple times) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 0f97a4e53..5fbaf9daf 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -3,11 +3,11 @@ ARG RELATED_IMAGE_FILE=related_images.json ARG CSV_FILE=bundle/manifests/lightspeed-operator.clusterserviceversion.yaml ARG OPERATOR_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-operator:latest ARG SERVICE_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-service-api:latest -ARG CONSOLE_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-console-plugin:latest -ARG CONSOLE_IMAGE_ORIGINAL_PF5=quay.io/openshift-lightspeed/lightspeed-console-plugin-pf5:latest -ARG OPENSHIFT_MCP_SERVER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43 -ARG DATAVERSE_EXPORTER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722 -ARG OCP_RAG_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag@sha256:98b50164ee5662fd0e807c76a0f712553442798858ad81e26c2cb307ee3f47e9 +ARG CONSOLE_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console:latest +ARG CONSOLE_IMAGE_ORIGINAL_PF5=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-console-pf5:latest +ARG OPENSHIFT_MCP_SERVER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server:latest +ARG DATAVERSE_EXPORTER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter:latest +ARG OCP_RAG_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag:latest RUN microdnf install -y jq diff --git a/bundle/manifests/lightspeed-operator.clusterserviceversion.yaml b/bundle/manifests/lightspeed-operator.clusterserviceversion.yaml index 128791008..8eb1262ef 100644 --- a/bundle/manifests/lightspeed-operator.clusterserviceversion.yaml +++ b/bundle/manifests/lightspeed-operator.clusterserviceversion.yaml @@ -604,12 +604,12 @@ spec: - --lcore-image=quay.io/lightspeed-core/lightspeed-stack:dev-latest - --use-lcore=false - --service-image=quay.io/openshift-lightspeed/lightspeed-service-api:latest - - --console-image=quay.io/openshift-lightspeed/lightspeed-console-plugin:latest - - --console-image-pf5=quay.io/openshift-lightspeed/lightspeed-console-plugin-pf5:latest + - --console-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console:latest + - --console-image-pf5=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-console-pf5:latest - --postgres-image=registry.redhat.io/rhel9/postgresql-16@sha256:42f385ac3c9b8913426da7c57e70bc6617cd237aaf697c667f6385a8c0b0118b - - --openshift-mcp-server-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43 - - --dataverse-exporter-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722 - - --ocp-rag-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag@sha256:98b50164ee5662fd0e807c76a0f712553442798858ad81e26c2cb307ee3f47e9 + - --openshift-mcp-server-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server:latest + - --dataverse-exporter-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter:latest + - --ocp-rag-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag:latest command: - /manager env: @@ -730,16 +730,16 @@ spec: - name: lightspeed-service-api image: quay.io/openshift-lightspeed/lightspeed-service-api:latest - name: lightspeed-console-plugin - image: quay.io/openshift-lightspeed/lightspeed-console-plugin:latest + image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console:latest - name: lightspeed-console-plugin-pf5 - image: quay.io/openshift-lightspeed/lightspeed-console-plugin-pf5:latest + image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-console-pf5:latest - name: lightspeed-operator image: quay.io/openshift-lightspeed/lightspeed-operator:latest - name: openshift-mcp-server - image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43 + image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server:latest - name: lightspeed-to-dataverse-exporter - image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722 + image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter:latest - name: lightspeed-ocp-rag - image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag@sha256:98b50164ee5662fd0e807c76a0f712553442798858ad81e26c2cb307ee3f47e9 + image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag:latest - name: lightspeed-postgresql image: registry.redhat.io/rhel9/postgresql-16@sha256:42f385ac3c9b8913426da7c57e70bc6617cd237aaf697c667f6385a8c0b0118b diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 2e525b12a..6622509d8 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -36,22 +36,22 @@ patches: value: --service-image=quay.io/openshift-lightspeed/lightspeed-service-api:latest - op: add path: /spec/template/spec/containers/0/args/- - value: --console-image=quay.io/openshift-lightspeed/lightspeed-console-plugin:latest + value: --console-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console:latest - op: add path: /spec/template/spec/containers/0/args/- - value: --console-image-pf5=quay.io/openshift-lightspeed/lightspeed-console-plugin-pf5:latest + value: --console-image-pf5=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-console-pf5:latest - op: add path: /spec/template/spec/containers/0/args/- value: --postgres-image=registry.redhat.io/rhel9/postgresql-16@sha256:42f385ac3c9b8913426da7c57e70bc6617cd237aaf697c667f6385a8c0b0118b - op: add path: /spec/template/spec/containers/0/args/- - value: --openshift-mcp-server-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43 + value: --openshift-mcp-server-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server:latest - op: add path: /spec/template/spec/containers/0/args/- - value: --dataverse-exporter-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722 + value: --dataverse-exporter-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter:latest - op: add path: /spec/template/spec/containers/0/args/- - value: --ocp-rag-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag@sha256:98b50164ee5662fd0e807c76a0f712553442798858ad81e26c2cb307ee3f47e9 + value: --ocp-rag-image=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag:latest - op: replace path: /spec/template/spec/containers/0/image value: quay.io/openshift-lightspeed/lightspeed-operator:latest diff --git a/hack/template_bundle.Containerfile b/hack/template_bundle.Containerfile index 61a214254..6040ebc3f 100644 --- a/hack/template_bundle.Containerfile +++ b/hack/template_bundle.Containerfile @@ -3,11 +3,11 @@ ARG RELATED_IMAGE_FILE=related_images.json ARG CSV_FILE=bundle/manifests/lightspeed-operator.clusterserviceversion.yaml ARG OPERATOR_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-operator:latest ARG SERVICE_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-service-api:latest -ARG CONSOLE_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-console-plugin:latest -ARG CONSOLE_IMAGE_ORIGINAL_PF5=quay.io/openshift-lightspeed/lightspeed-console-plugin-pf5:latest -ARG OPENSHIFT_MCP_SERVER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43 -ARG DATAVERSE_EXPORTER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722 -ARG OCP_RAG_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag@sha256:98b50164ee5662fd0e807c76a0f712553442798858ad81e26c2cb307ee3f47e9 +ARG CONSOLE_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console:latest +ARG CONSOLE_IMAGE_ORIGINAL_PF5=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-console-pf5:latest +ARG OPENSHIFT_MCP_SERVER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server:latest +ARG DATAVERSE_EXPORTER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter:latest +ARG OCP_RAG_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag:latest RUN microdnf install -y jq diff --git a/hack/update_bundle.sh b/hack/update_bundle.sh index dcd409069..7a5e1a7d3 100755 --- a/hack/update_bundle.sh +++ b/hack/update_bundle.sh @@ -127,7 +127,11 @@ else }, { "name": "lightspeed-console-plugin", - "image": "quay.io/openshift-lightspeed/lightspeed-console-plugin:latest" + "image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console:latest" + }, + { + "name": "lightspeed-console-plugin-pf5", + "image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-console-pf5:latest", }, { "name": "lightspeed-operator", @@ -135,15 +139,15 @@ else }, { "name": "openshift-mcp-server", - "image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43" + "image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server:latest" }, { "name": "lightspeed-to-dataverse-exporter", - "image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722" + "image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter:latest" } { "name": "lightspeed-ocp-rag", - "image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag@sha256:db6349fd04308a05e803e00b0ed38249a84c5f0f294a1e95b49b9ac010f516ec" + "image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag:latest" } ] EOF @@ -171,11 +175,11 @@ ${KUSTOMIZE} build config/manifests | ${OPERATOR_SDK} generate bundle ${BUNDLE_G ${OPERATOR_SDK} bundle validate ./bundle # set service, console, and openshift-mcp-server images for the operator ${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/openshift-lightspeed/lightspeed-service-api:latest\", ${SERVICE_IMAGE}))" -i ${CSV_FILE} -${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/openshift-lightspeed/lightspeed-console-plugin:latest\", ${CONSOLE_IMAGE}))" -i ${CSV_FILE} -${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43\", ${OPENSHIFT_MCP_SERVER_IMAGE}))" -i ${CSV_FILE} +${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console:latest\", ${CONSOLE_IMAGE}))" -i ${CSV_FILE} +${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server:latest\", ${OPENSHIFT_MCP_SERVER_IMAGE}))" -i ${CSV_FILE} ${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].image |= sub(\"quay.io/openshift-lightspeed/lightspeed-operator:latest\", ${OPERATOR_IMAGE}))" -i ${CSV_FILE} -${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722\", ${DATAVERSE_EXPORTER_IMAGE}))" -i ${CSV_FILE} -${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag@sha256:db6349fd04308a05e803e00b0ed38249a84c5f0f294a1e95b49b9ac010f516ec\", ${OCP_RAG_IMAGE}))" -i ${CSV_FILE} +${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter:latest\", ${DATAVERSE_EXPORTER_IMAGE}))" -i ${CSV_FILE} +${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-ocp-rag:latest\", ${OCP_RAG_IMAGE}))" -i ${CSV_FILE} # set related images to the CSV file ${YQ} eval -i '.spec.relatedImages='"${RELATED_IMAGES}" ${CSV_FILE} # add compatibility labels to the annotations file diff --git a/internal/controller/utils/constants.go b/internal/controller/utils/constants.go index 48e71d470..1fc4c1fac 100644 --- a/internal/controller/utils/constants.go +++ b/internal/controller/utils/constants.go @@ -133,9 +133,9 @@ const ( // ConsoleUIDeploymentName is the name of the console UI deployment ConsoleUIDeploymentName = "lightspeed-console-plugin" // ConsoleUIImage is the image of the console UI plugin - ConsoleUIImageDefault = "quay.io/openshift-lightspeed/lightspeed-console-plugin:latest" + ConsoleUIImageDefault = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console:latest" // ConsoleUIImage is the image of the console UI plugin - ConsoleUIImagePF5Default = "quay.io/openshift-lightspeed/lightspeed-console-plugin-pf5:latest" + ConsoleUIImagePF5Default = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-console-pf5:latest" // ConsoleUIHTTPSPort is the port number of the console UI service ConsoleUIHTTPSPort = 9443 // ConsoleUIPluginName is the name of the console UI plugin @@ -291,7 +291,7 @@ ssl_ca_file = '/etc/certs/cm-olspostgresca/service-ca.crt' // MetricsReaderServiceAccountName is the name of the service account for the metrics reader MetricsReaderServiceAccountName = "lightspeed-operator-metrics-reader" // MCP server image - OpenShiftMCPServerImageDefault = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43" + OpenShiftMCPServerImageDefault = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server:latest" // MCP server URL OpenShiftMCPServerURL = "http://localhost:%d/mcp" // MCP server port @@ -313,7 +313,7 @@ ssl_ca_file = '/etc/certs/cm-olspostgresca/service-ca.crt' /*** Data Exporter Constants ***/ // Dataverse exporter image - DataverseExporterImageDefault = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722" + DataverseExporterImageDefault = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter:latest" // ExporterConfigCmName is the name of the exporter configmap ExporterConfigCmName = "lightspeed-exporter-config" // ExporterConfigVolumeName is the name of the volume for exporter configuration