Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ LABEL summary="Red Hat OpenShift Lightspeed"
LABEL com.redhat.openshift.versions=v4.16-v4.20

# Set user to non-root for security reasons.
USER 1001
USER 1001
3 changes: 2 additions & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ var (
"lightspeed-service": controller.OLSAppServerImageDefault,
"postgres-image": controller.PostgresServerImageDefault,
"console-plugin": controller.ConsoleUIImageDefault,
"console-plugin-pf5": controller.ConsoleUIImagePF5Default,
"openshift-mcp-server-image": controller.OpenShiftMCPServerImageDefault,
"dataverse-exporter-image": controller.DataverseExporterImageDefault,
}
Expand Down Expand Up @@ -148,7 +149,7 @@ func main() {
flag.StringVar(&caCertPath, "ca-cert", controller.OperatorCACertPathDefault, "The path to the CA certificate file.")
flag.StringVar(&serviceImage, "service-image", controller.OLSAppServerImageDefault, "The image of the lightspeed-service container.")
flag.StringVar(&consoleImage, "console-image", controller.ConsoleUIImageDefault, "The image of the console-plugin container using PatternFly 6.")
flag.StringVar(&consoleImage_pf5, "console-image_pf5", controller.ConsoleUIImagePF5Default, "The image of the console-plugin container using PatternFly 5.")
flag.StringVar(&consoleImage_pf5, "console-image-pf5", controller.ConsoleUIImagePF5Default, "The image of the console-plugin container using PatternFly 5.")
flag.StringVar(&namespace, "namespace", "", "The namespace where the operator is deployed.")
flag.StringVar(&postgresImage, "postgres-image", controller.PostgresServerImageDefault, "The image of the PostgreSQL server.")
flag.StringVar(&openshiftMCPServerImage, "openshift-mcp-server-image", controller.OpenShiftMCPServerImageDefault, "The image of the OpenShift MCP server container.")
Expand Down
10 changes: 5 additions & 5 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ resources:
- ../prometheus

patches:
# set image of lightspeed-service-api
# todo: sync with the release version of openshift/lightspeed-service-api
- patch: |-
# set image of lightspeed-service-api
# todo: sync with the release version of openshift/lightspeed-service-api
- patch: |-
- op: add
path: /spec/template/spec/containers/0/args/-
value: --service-image=quay.io/openshift-lightspeed/lightspeed-service-api:latest
Expand All @@ -49,7 +49,7 @@ patches:
- op: replace
path: /spec/template/spec/containers/0/image
value: quay.io/openshift-lightspeed/lightspeed-operator:latest
target:
target:
group: apps
version: v1
kind: Deployment
Expand Down Expand Up @@ -162,4 +162,4 @@ patches:
# options:
# delimiter: '.'
# index: 1
# create: true
# create: true
12 changes: 6 additions & 6 deletions config/manager/imagedigestmirrorset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
kind: ImageDigestMirrorSet
apiVersion: config.openshift.io/v1
metadata:
name: openshift-lightspeed-prod-to-ci
name: openshift-lightspeed-prod-to-ci
spec:
imageDigestMirrors:
imageDigestMirrors:
- source: registry.redhat.io/openshift-lightspeed/lightspeed-rhel9-operator
mirrors:
- quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-operator
- quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-operator
- source: registry.redhat.io/openshift-lightspeed/lightspeed-operator-bundle
mirrors:
- quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols-bundle
- quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols-bundle
- source: registry.redhat.io/openshift-lightspeed/lightspeed-service-api-rhel9
mirrors:
- quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-service
- quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-service
- source: registry.redhat.io/openshift-lightspeed/lightspeed-console-plugin-rhel9
mirrors:
- quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console
- quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/ols/lightspeed-console
2 changes: 1 addition & 1 deletion hack/snapshot_to_image_list.sh
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,4 @@ if [ -n "${OUTPUT_FILE}" ]; then
${JQ} <<<$RELATED_IMAGES >${OUTPUT_FILE}
else
${JQ} <<<$RELATED_IMAGES
fi
fi
5 changes: 5 additions & 0 deletions related_images.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
"image": "registry.redhat.io/openshift-lightspeed/lightspeed-console-plugin-rhel9@sha256:1db560558b454b15f307f07b2840fbfd96f3ee73d6c515561c9d9d7d77156b0e",
"revision": "9157be74a22855364d8e69684bdc59589529c413"
},
{
"name": "lightspeed-console-plugin-pf5",
"image": "registry.redhat.io/openshift-lightspeed/lightspeed-console-pf5@sha256:2d39169b10c69a03f9792e37deb279129c72d170ad87433267f46df29413598e",
"revision": "799c836accf511a12ea1e844d430cb22c6736851"
},
{
"name": "lightspeed-operator",
"image": "registry.redhat.io/openshift-lightspeed/lightspeed-rhel9-operator@sha256:4d8dff93a554b48521163c6c37029eb4026a27aa54abe8870ad7a963be8e367a",
Expand Down