Skip to content

Commit 1103fbc

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1090 from raptorsun/bundle-1
bundle: update with snapshot ols-dlz55
2 parents 3a3f6d0 + c04fe3f commit 1103fbc

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

‎bundle.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN OPERATOR_IMAGE=$(jq -r '.[] | select(.name == "lightspeed-operator") | .imag
1616
RUN SERVICE_IMAGE=$(jq -r '.[] | select(.name == "lightspeed-service-api") | .image' /${RELATED_IMAGE_FILE}) && sed -i "s|${SERVICE_IMAGE_ORIGINAL}|${SERVICE_IMAGE}|g" /manifests/lightspeed-operator.clusterserviceversion.yaml
1717
RUN CONSOLE_IMAGE=$(jq -r '.[] | select(.name == "lightspeed-console-plugin") | .image' /${RELATED_IMAGE_FILE}) && sed -i "s|${CONSOLE_IMAGE_ORIGINAL}|${CONSOLE_IMAGE}|g" /manifests/lightspeed-operator.clusterserviceversion.yaml
1818
RUN OPENSHIFT_MCP_SERVER_IMAGE=$(jq -r '.[] | select(.name == "openshift-mcp-server") | .image' /${RELATED_IMAGE_FILE}) && sed -i "s|${OPENSHIFT_MCP_SERVER_IMAGE_ORIGINAL}|${OPENSHIFT_MCP_SERVER_IMAGE}|g" /manifests/lightspeed-operator.clusterserviceversion.yaml
19-
RUN DATAVERSE_EXPORTER_IMAGE=$(jq -r '.[] | select(.name == "dataverse-exporter") | .image' /${RELATED_IMAGE_FILE}) && sed -i "s|${DATAVERSE_EXPORTER_IMAGE_ORIGINAL}|${DATAVERSE_EXPORTER_IMAGE}|g" /manifests/lightspeed-operator.clusterserviceversion.yaml
19+
RUN DATAVERSE_EXPORTER_IMAGE=$(jq -r '.[] | select(.name == "lightspeed-to-dataverse-exporter") | .image' /${RELATED_IMAGE_FILE}) && sed -i "s|${DATAVERSE_EXPORTER_IMAGE_ORIGINAL}|${DATAVERSE_EXPORTER_IMAGE}|g" /manifests/lightspeed-operator.clusterserviceversion.yaml
2020

2121

2222
FROM registry.redhat.io/ubi9/ubi-minimal:9.6

‎bundle/manifests/lightspeed-operator.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,5 +720,5 @@ spec:
720720
image: quay.io/openshift-lightspeed/lightspeed-operator:latest
721721
- name: openshift-mcp-server
722722
image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43
723-
- name: dataverse-exporter
723+
- name: lightspeed-to-dataverse-exporter
724724
image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722

‎hack/template_bundle.Containerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN OPERATOR_IMAGE=$(jq -r '.[] | select(.name == "lightspeed-operator") | .imag
1616
RUN SERVICE_IMAGE=$(jq -r '.[] | select(.name == "lightspeed-service-api") | .image' /${RELATED_IMAGE_FILE}) && sed -i "s|${SERVICE_IMAGE_ORIGINAL}|${SERVICE_IMAGE}|g" /manifests/lightspeed-operator.clusterserviceversion.yaml
1717
RUN CONSOLE_IMAGE=$(jq -r '.[] | select(.name == "lightspeed-console-plugin") | .image' /${RELATED_IMAGE_FILE}) && sed -i "s|${CONSOLE_IMAGE_ORIGINAL}|${CONSOLE_IMAGE}|g" /manifests/lightspeed-operator.clusterserviceversion.yaml
1818
RUN OPENSHIFT_MCP_SERVER_IMAGE=$(jq -r '.[] | select(.name == "openshift-mcp-server") | .image' /${RELATED_IMAGE_FILE}) && sed -i "s|${OPENSHIFT_MCP_SERVER_IMAGE_ORIGINAL}|${OPENSHIFT_MCP_SERVER_IMAGE}|g" /manifests/lightspeed-operator.clusterserviceversion.yaml
19-
RUN DATAVERSE_EXPORTER_IMAGE=$(jq -r '.[] | select(.name == "dataverse-exporter") | .image' /${RELATED_IMAGE_FILE}) && sed -i "s|${DATAVERSE_EXPORTER_IMAGE_ORIGINAL}|${DATAVERSE_EXPORTER_IMAGE}|g" /manifests/lightspeed-operator.clusterserviceversion.yaml
19+
RUN DATAVERSE_EXPORTER_IMAGE=$(jq -r '.[] | select(.name == "lightspeed-to-dataverse-exporter") | .image' /${RELATED_IMAGE_FILE}) && sed -i "s|${DATAVERSE_EXPORTER_IMAGE_ORIGINAL}|${DATAVERSE_EXPORTER_IMAGE}|g" /manifests/lightspeed-operator.clusterserviceversion.yaml
2020

2121
##__GENERATED_CONTAINER_FILE__##
2222

‎hack/update_bundle.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ BUNDLE_DOCKERFILE="bundle.Dockerfile"
112112
# if RELATED_IMAGES is not defined, extract related images or use default values
113113
if [ -f "${RELATED_IMAGES_FILENAME}" ]; then
114114
echo "using related images from file ${RELATED_IMAGES_FILENAME}"
115-
RELATED_IMAGES=$(${JQ} '[ .[] | select(.name == "lightspeed-service-api" or .name == "lightspeed-operator" or .name == "lightspeed-console-plugin" or .name == "openshift-mcp-server" or .name == "dataverse-exporter") ]' ${RELATED_IMAGES_FILENAME})
115+
RELATED_IMAGES=$(${JQ} '[ .[] | select(.name == "lightspeed-service-api" or .name == "lightspeed-operator" or .name == "lightspeed-console-plugin" or .name == "openshift-mcp-server" or .name == "lightspeed-to-dataverse-exporter") ]' ${RELATED_IMAGES_FILENAME})
116116
elif [ -f "${CSV_FILE}" ]; then
117117
echo "using related images from CSV file ${CSV_FILE}"
118118
RELATED_IMAGES=$(${YQ} ' .spec.relatedImages' -ojson ${CSV_FILE})
@@ -138,7 +138,7 @@ else
138138
"image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43"
139139
},
140140
{
141-
"name": "dataverse-exporter",
141+
"name": "lightspeed-to-dataverse-exporter",
142142
"image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722"
143143
}
144144
]
@@ -154,7 +154,7 @@ OPERATOR_IMAGE=$(${JQ} '.[] | select(.name == "lightspeed-operator") | .image' <
154154
SERVICE_IMAGE=$(${JQ} '.[] | select(.name == "lightspeed-service-api") | .image' <<<${RELATED_IMAGES})
155155
CONSOLE_IMAGE=$(${JQ} '.[] | select(.name == "lightspeed-console-plugin") | .image' <<<${RELATED_IMAGES})
156156
OPENSHIFT_MCP_SERVER_IMAGE=$(${JQ} '.[] | select(.name == "openshift-mcp-server") | .image' <<<${RELATED_IMAGES})
157-
DATAVERSE_EXPORTER_IMAGE=$(${JQ} '.[] | select(.name == "dataverse-exporter") | .image' <<<${RELATED_IMAGES})
157+
DATAVERSE_EXPORTER_IMAGE=$(${JQ} '.[] | select(.name == "lightspeed-to-dataverse-exporter") | .image' <<<${RELATED_IMAGES})
158158

159159
# Build the bundle image
160160
echo "Updating bundle artifacts for image ${OPERATOR_IMAGE}"

‎related_images.json‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
[
22
{
33
"name": "lightspeed-service-api",
4-
"image": "registry.redhat.io/openshift-lightspeed/lightspeed-service-api-rhel9@sha256:4a9336718d247bbbe5caade2c7186e8d11e636683ab3b043ff5058b486eaf6fa",
5-
"revision": "5311006d97802fd1b9bdf6adf3a348d692bdcfae"
4+
"image": "registry.redhat.io/openshift-lightspeed/lightspeed-service-api-rhel9@sha256:5e3aa38ee18f32e3e292c54121dd21758a5ef6a248d199020a0f4f4095fbdb94",
5+
"revision": "4ffeb005babdcbf776bb412f17171a80b87df7f6"
66
},
77
{
88
"name": "lightspeed-console-plugin",
9-
"image": "registry.redhat.io/openshift-lightspeed/lightspeed-console-plugin-rhel9@sha256:1db560558b454b15f307f07b2840fbfd96f3ee73d6c515561c9d9d7d77156b0e",
10-
"revision": "9157be74a22855364d8e69684bdc59589529c413"
9+
"image": "registry.redhat.io/openshift-lightspeed/lightspeed-console-plugin-rhel9@sha256:001b15649014380c0f69c3f27c488462f8b53a41ff3c5c432f0dd62bc20a7263",
10+
"revision": "90e13b5db3962935f4c19cc3e3d96202b035f418"
1111
},
1212
{
1313
"name": "lightspeed-operator",
14-
"image": "registry.redhat.io/openshift-lightspeed/lightspeed-rhel9-operator@sha256:4d8dff93a554b48521163c6c37029eb4026a27aa54abe8870ad7a963be8e367a",
15-
"revision": "3db49d631c32d0b669162bb446f1151e7741a43c"
14+
"image": "registry.redhat.io/openshift-lightspeed/lightspeed-rhel9-operator@sha256:164a8f4a93ff81f4240f79fbab7937fbb6742aa737ba8a0f53ae816a3e424bad",
15+
"revision": "0811f746553dd681ee4260acb1ab8e6282068515"
1616
},
1717
{
1818
"name": "openshift-mcp-server",
19-
"image": "registry.redhat.io/openshift-lightspeed/openshift-mcp-server-rhel9@sha256:e23ab62b89f1952aec1979bfe5b73a4c52b8bdad5ef44dc8b5d1620a0d5c69d2",
20-
"revision": "2b8e41e03ca019fd2ee7c309d0de347f63550a3c"
19+
"image": "registry.redhat.io/openshift-lightspeed/openshift-mcp-server-rhel9@sha256:99fc7c5d7be0328a98081ffef79cb1e8379443c7d80b3b89bedde616a0187225",
20+
"revision": "b5bc635b6824cab65e4056503c377732f0c23c89"
2121
},
2222
{
23-
"name": "lightspeed-postgresql",
24-
"image": "registry.redhat.io/rhel9/postgresql-16@sha256:42f385ac3c9b8913426da7c57e70bc6617cd237aaf697c667f6385a8c0b0118b"
23+
"name": "lightspeed-to-dataverse-exporter",
24+
"image": "registry.redhat.io/openshift-lightspeed/lightspeed-to-dataverse-exporter-rhel9@sha256:165ed82825bf40c3bf30f5838ee551f830a7aec61b917adabc802e16a7b21e74",
25+
"revision": "3cee984c5cbfd5404481a75b9a95902e85189e48"
2526
},
2627
{
27-
"name": "dataverse-exporter",
28-
"image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-to-dataverse-exporter@sha256:ccb6705a5e7ff0c4d371dc72dc8cf319574a2d64bcc0a89ccc7130f626656722"
28+
"name": "lightspeed-postgresql",
29+
"image": "registry.redhat.io/rhel9/postgresql-16@sha256:42f385ac3c9b8913426da7c57e70bc6617cd237aaf697c667f6385a8c0b0118b"
2930
},
3031
{
3132
"name": "lightspeed-operator-bundle",

0 commit comments

Comments
 (0)