Skip to content

OLS-2321: remove lightspeed-console from Prow CI #1212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
syedriko wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OLS-2321: remove lightspeed-console from Prow CI #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/lightspeed-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions hack/template_bundle.Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions hack/update_bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/utils/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down