diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 3cf47aad1..04bcc1c68 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -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 \ No newline at end of file diff --git a/cmd/main.go b/cmd/main.go index ebf8a169c..04a823c53 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -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, } @@ -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.") diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 659e0ecc6..81cf85cfc 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -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 @@ -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 @@ -162,4 +162,4 @@ patches: # options: # delimiter: '.' # index: 1 -# create: true +# create: true \ No newline at end of file diff --git a/config/manager/imagedigestmirrorset.yaml b/config/manager/imagedigestmirrorset.yaml index 1111cedaa..6d8d00c10 100644 --- a/config/manager/imagedigestmirrorset.yaml +++ b/config/manager/imagedigestmirrorset.yaml @@ -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 \ No newline at end of file diff --git a/hack/snapshot_to_image_list.sh b/hack/snapshot_to_image_list.sh index 3ef76c091..d8a7f6e0f 100755 --- a/hack/snapshot_to_image_list.sh +++ b/hack/snapshot_to_image_list.sh @@ -224,4 +224,4 @@ if [ -n "${OUTPUT_FILE}" ]; then ${JQ} <<<$RELATED_IMAGES >${OUTPUT_FILE} else ${JQ} <<<$RELATED_IMAGES -fi +fi \ No newline at end of file diff --git a/related_images.json b/related_images.json index f0c690b15..f82e74cd7 100644 --- a/related_images.json +++ b/related_images.json @@ -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",