Skip to content

Commit be3b60c

Browse files
OpinionatedHeronrm3lnickboldt
authored
[chore] Updating orchestrator npm packages to OCI artifacts (#307)
* Updating orchestrator npm packages to OCI artifacts Signed-off-by: Leanne Ahern <lahern@redhat.com> * Bumping backstage chart based on changes to values.yaml Signed-off-by: Leanne Ahern <lahern@redhat.com> * Updating ReadMe per pre-commit Signed-off-by: Leanne Ahern <lahern@redhat.com> * Simplify the configuration by leveraging the {{inherit}} option This option is supported as of RHDH 1.9 and allows inheriting the version from the dynamic-plugins.default.yaml (coming from the plugin catalog index image). This way, we are sure to use the default plugin version. NOTE: For this to work properly, the plugin refs should match. So if the orchestrator plugins refs are changed later to quay.io or registry.access.redhat.com in the DPDY, we should update them here as well. * Updating orchestrator packages to quay.io from ghcr.io Signed-off-by: Leanne Ahern <lahern@redhat.com> * Correcting quay.io path Signed-off-by: Leanne Ahern <lahern@redhat.com> * Updating quay.io path to registry.access.redhat instead Signed-off-by: Leanne Ahern <lahern@redhat.com> * Updating package path for oci and removing plugin config Signed-off-by: Leanne Ahern <lahern@redhat.com> --------- Signed-off-by: Leanne Ahern <lahern@redhat.com> Co-authored-by: Armel Soro <asoro@redhat.com> Co-authored-by: Nick Boldt <nboldt@redhat.com>
1 parent 18b0c95 commit be3b60c

3 files changed

Lines changed: 12 additions & 57 deletions

File tree

charts/backstage/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ sources: []
4747
# Versions are expected to follow Semantic Versioning (https://semver.org/)
4848
# Note that when this chart is published to https://github.com/openshift-helm-charts/charts
4949
# it will follow the RHDH versioning 1.y.z
50-
version: 5.2.0
50+
version: 5.2.1

charts/backstage/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# RHDH Backstage Helm Chart for OpenShift
33

4-
![Version: 5.2.0](https://img.shields.io/badge/Version-5.2.0-informational?style=flat-square)
4+
![Version: 5.2.1](https://img.shields.io/badge/Version-5.2.1-informational?style=flat-square)
55
![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
66

77
A Helm chart for deploying Red Hat Developer Hub, which is a Red Hat supported version of Backstage.
@@ -30,7 +30,7 @@ helm repo add bitnami https://charts.bitnami.com/bitnami
3030
helm repo add backstage https://backstage.github.io/charts
3131
helm repo add redhat-developer https://redhat-developer.github.io/rhdh-chart
3232

33-
helm install my-backstage redhat-developer/backstage --version 5.2.0
33+
helm install my-backstage redhat-developer/backstage --version 5.2.1
3434
```
3535

3636
## Introduction
@@ -178,7 +178,7 @@ Kubernetes: `>= 1.27.0-0`
178178
| global.host | Custom hostname shorthand, overrides `global.clusterRouterBase`, `upstream.ingress.host`, `route.host`, and url values in `upstream.backstage.appConfig`. | string | `""` |
179179
| nameOverride | | string | `"developer-hub"` |
180180
| orchestrator.enabled | | bool | `false` |
181-
| orchestrator.plugins | Orchestrator plugins and their configuration | list | `[{"disabled":false,"integrity":"sha512-6G0YguzCM5nCDpOrIGJpLTXVMr6EBdIVqSXtsLH9RvBH25RTuFpfJ7q6eEp26DqveaiqUCfBpJ51smdjcsEzFQ==","package":"https://npm.registry.redhat.com/@redhat/backstage-plugin-orchestrator-backend-dynamic/-/backstage-plugin-orchestrator-backend-dynamic-1.8.2.tgz","pluginConfig":{"orchestrator":{"dataIndexService":{"url":"http://sonataflow-platform-data-index-service.{{ .Release.Namespace }}"}}}},{"disabled":false,"integrity":"sha512-rnUA6iZ2JVAyASfwS4P9HeFmpqCgH6FQouzzg4s6lCPAsYUFvu6tifJ3df5lThXPUTJ2cDvvQgamU+4DiHP2jw==","package":"https://npm.registry.redhat.com/@redhat/backstage-plugin-orchestrator/-/backstage-plugin-orchestrator-1.8.2.tgz","pluginConfig":{"dynamicPlugins":{"frontend":{"red-hat-developer-hub.backstage-plugin-orchestrator":{"appIcons":[{"importName":"OrchestratorIcon","name":"orchestratorIcon"}],"dynamicRoutes":[{"importName":"OrchestratorPage","menuItem":{"icon":"orchestratorIcon","text":"Orchestrator"},"path":"/orchestrator"}],"entityTabs":[{"mountPoint":"entity.page.workflows","path":"/workflows","title":"Workflows"}],"mountPoints":[{"config":{"if":{"anyOf":["IsOrchestratorCatalogTabAvailable"]},"layout":{"gridColumn":"1 / -1"}},"importName":"OrchestratorCatalogTab","mountPoint":"entity.page.workflows/cards"}]}}}}},{"disabled":false,"integrity":"sha512-N2hCn9RI/QVEoK56FAkGkSDbvfQCOIzVsJTwDX0kf//npO++2crRSJpB1Lr/m2UtYxfaXZX53p8sPcK3g8yWkQ==","package":"https://npm.registry.redhat.com/@redhat/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic/-/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic-1.8.2.tgz","pluginConfig":{"orchestrator":{"dataIndexService":{"url":"http://sonataflow-platform-data-index-service.{{ .Release.Namespace }}"}}}},{"disabled":false,"integrity":"sha512-Pe0dn3g+YTK3jbl36E8nt4zdyH/3w+MWgRyFWPc2B0eV4/L/aRfRC4KxcktmHPdamRGXTIaXL6cFae8TZl8Htw==","package":"https://npm.registry.redhat.com/@redhat/backstage-plugin-orchestrator-form-widgets/-/backstage-plugin-orchestrator-form-widgets-1.8.2.tgz","pluginConfig":{"dynamicPlugins":{"frontend":{"red-hat-developer-hub.backstage-plugin-orchestrator-form-widgets":{}}}}}]` |
181+
| orchestrator.plugins | Orchestrator plugins and their configuration | list | `[{"disabled":false,"package":"oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{ \"{{inherit}}\" }}"},{"disabled":false,"package":"oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{ \"{{inherit}}\" }}"},{"disabled":false,"package":"oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ \"{{inherit}}\" }}"},{"disabled":false,"package":"oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{ \"{{inherit}}\" }}"}]` |
182182
| orchestrator.serverlessLogicOperator.enabled | | bool | `true` |
183183
| orchestrator.serverlessOperator.enabled | | bool | `true` |
184184
| orchestrator.sonataflowPlatform.createDBJobImage | Image for the container used by the create-db job | string | `"{{ .Values.upstream.postgresql.image.registry }}/{{ .Values.upstream.postgresql.image.repository }}:{{ .Values.upstream.postgresql.image.tag }}"` |

charts/backstage/values.yaml

Lines changed: 8 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -394,56 +394,11 @@ orchestrator:
394394
dataIndexImage: ""
395395
# -- Orchestrator plugins and their configuration
396396
plugins:
397-
# RHDHBUGS-1464: Note that the plugins here fetch the packages from their direct HTTP download URLs from the (official) Red Hat NPM Registry.
398-
# Previously, we were using the "@redhat/plugin@version" form along with injecting a .npmrc Secret to resolve the "@redhat" scope,
399-
# but this caused conflicting issues with user-provided .npmrc secrets.
400-
- disabled: false
401-
package: "https://npm.registry.redhat.com/@redhat/backstage-plugin-orchestrator-backend-dynamic/-/backstage-plugin-orchestrator-backend-dynamic-1.8.2.tgz"
402-
integrity: sha512-6G0YguzCM5nCDpOrIGJpLTXVMr6EBdIVqSXtsLH9RvBH25RTuFpfJ7q6eEp26DqveaiqUCfBpJ51smdjcsEzFQ==
403-
pluginConfig:
404-
orchestrator:
405-
dataIndexService:
406-
url: http://sonataflow-platform-data-index-service.{{ .Release.Namespace }}
407-
- disabled: false
408-
package: "https://npm.registry.redhat.com/@redhat/backstage-plugin-orchestrator/-/backstage-plugin-orchestrator-1.8.2.tgz"
409-
integrity: sha512-rnUA6iZ2JVAyASfwS4P9HeFmpqCgH6FQouzzg4s6lCPAsYUFvu6tifJ3df5lThXPUTJ2cDvvQgamU+4DiHP2jw==
410-
pluginConfig:
411-
dynamicPlugins:
412-
frontend:
413-
red-hat-developer-hub.backstage-plugin-orchestrator:
414-
appIcons:
415-
- name: orchestratorIcon
416-
importName: OrchestratorIcon
417-
dynamicRoutes:
418-
- path: /orchestrator
419-
importName: OrchestratorPage
420-
menuItem:
421-
icon: orchestratorIcon
422-
text: Orchestrator
423-
entityTabs:
424-
- path: /workflows
425-
title: Workflows
426-
mountPoint: entity.page.workflows
427-
mountPoints:
428-
- mountPoint: entity.page.workflows/cards
429-
importName: OrchestratorCatalogTab
430-
config:
431-
layout:
432-
gridColumn: "1 / -1"
433-
if:
434-
anyOf:
435-
- IsOrchestratorCatalogTabAvailable
436-
- disabled: false
437-
package: "https://npm.registry.redhat.com/@redhat/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic/-/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic-1.8.2.tgz"
438-
integrity: sha512-N2hCn9RI/QVEoK56FAkGkSDbvfQCOIzVsJTwDX0kf//npO++2crRSJpB1Lr/m2UtYxfaXZX53p8sPcK3g8yWkQ==
439-
pluginConfig:
440-
orchestrator:
441-
dataIndexService:
442-
url: http://sonataflow-platform-data-index-service.{{ .Release.Namespace }}
443-
- disabled: false
444-
package: "https://npm.registry.redhat.com/@redhat/backstage-plugin-orchestrator-form-widgets/-/backstage-plugin-orchestrator-form-widgets-1.8.2.tgz"
445-
integrity: sha512-Pe0dn3g+YTK3jbl36E8nt4zdyH/3w+MWgRyFWPc2B0eV4/L/aRfRC4KxcktmHPdamRGXTIaXL6cFae8TZl8Htw==
446-
pluginConfig:
447-
dynamicPlugins:
448-
frontend:
449-
red-hat-developer-hub.backstage-plugin-orchestrator-form-widgets: {}
397+
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{ "{{inherit}}" }}'
398+
disabled: false
399+
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{ "{{inherit}}" }}'
400+
disabled: false
401+
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{inherit}}" }}'
402+
disabled: false
403+
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{ "{{inherit}}" }}'
404+
disabled: false

0 commit comments

Comments
 (0)