diff --git a/Makefile b/Makefile index 2e1101b43..dcfbe653c 100644 --- a/Makefile +++ b/Makefile @@ -209,7 +209,7 @@ 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 +CONSOLE_PLUGIN_IMG ?= quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console@sha256:930a37683d9d856a4958841f6d449f9d5eb757247756a101b8836d9f05be2a90 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 diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 591d9d20f..a317ed491 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -3,8 +3,8 @@ 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 CONSOLE_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console@sha256:930a37683d9d856a4958841f6d449f9d5eb757247756a101b8836d9f05be2a90 +ARG CONSOLE_IMAGE_ORIGINAL_PF5=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-console-pf5@sha256:93415f5a0e567313bc177a0e6bf3a7370ed5691c99db6f692da8be14607c3b41 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 diff --git a/bundle/manifests/lightspeed-operator.clusterserviceversion.yaml b/bundle/manifests/lightspeed-operator.clusterserviceversion.yaml index e8b35c03d..0f2b582aa 100644 --- a/bundle/manifests/lightspeed-operator.clusterserviceversion.yaml +++ b/bundle/manifests/lightspeed-operator.clusterserviceversion.yaml @@ -627,8 +627,8 @@ 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@sha256:930a37683d9d856a4958841f6d449f9d5eb757247756a101b8836d9f05be2a90 + - --console-image-pf5=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-console-pf5@sha256:93415f5a0e567313bc177a0e6bf3a7370ed5691c99db6f692da8be14607c3b41 - --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 @@ -753,9 +753,9 @@ 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@sha256:930a37683d9d856a4958841f6d449f9d5eb757247756a101b8836d9f05be2a90 - 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@sha256:93415f5a0e567313bc177a0e6bf3a7370ed5691c99db6f692da8be14607c3b41 - name: lightspeed-operator image: quay.io/openshift-lightspeed/lightspeed-operator:latest - name: openshift-mcp-server diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 2e525b12a..cda435f5a 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -36,10 +36,10 @@ 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@sha256:930a37683d9d856a4958841f6d449f9d5eb757247756a101b8836d9f05be2a90 - 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@sha256:93415f5a0e567313bc177a0e6bf3a7370ed5691c99db6f692da8be14607c3b41 - op: add path: /spec/template/spec/containers/0/args/- value: --postgres-image=registry.redhat.io/rhel9/postgresql-16@sha256:42f385ac3c9b8913426da7c57e70bc6617cd237aaf697c667f6385a8c0b0118b diff --git a/hack/template_bundle.Containerfile b/hack/template_bundle.Containerfile index 61a214254..0cf0564c9 100644 --- a/hack/template_bundle.Containerfile +++ b/hack/template_bundle.Containerfile @@ -3,8 +3,8 @@ 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 CONSOLE_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console@sha256:930a37683d9d856a4958841f6d449f9d5eb757247756a101b8836d9f05be2a90 +ARG CONSOLE_IMAGE_ORIGINAL_PF5=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-console-pf5@sha256:93415f5a0e567313bc177a0e6bf3a7370ed5691c99db6f692da8be14607c3b41 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 diff --git a/hack/update_bundle.sh b/hack/update_bundle.sh index dcd409069..3b40f6067 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@sha256:930a37683d9d856a4958841f6d449f9d5eb757247756a101b8836d9f05be2a90" + }, + { + "name": "lightspeed-console-plugin-pf5", + "image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-console-pf5@sha256:93415f5a0e567313bc177a0e6bf3a7370ed5691c99db6f692da8be14607c3b41", }, { "name": "lightspeed-operator", @@ -171,7 +175,7 @@ ${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/ols/lightspeed-console@sha256:930a37683d9d856a4958841f6d449f9d5eb757247756a101b8836d9f05be2a90\", ${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[].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} diff --git a/internal/controller/utils/constants.go b/internal/controller/utils/constants.go index 8e263e87b..7dc5637d1 100644 --- a/internal/controller/utils/constants.go +++ b/internal/controller/utils/constants.go @@ -127,9 +127,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@sha256:930a37683d9d856a4958841f6d449f9d5eb757247756a101b8836d9f05be2a90" // 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@sha256:93415f5a0e567313bc177a0e6bf3a7370ed5691c99db6f692da8be14607c3b41" // ConsoleUIHTTPSPort is the port number of the console UI service ConsoleUIHTTPSPort = 9443 // ConsoleUIPluginName is the name of the console UI plugin