diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml index 41449657..04f6eaaf 100644 --- a/charts/backstage/Chart.yaml +++ b/charts/backstage/Chart.yaml @@ -47,4 +47,4 @@ sources: [] # Versions are expected to follow Semantic Versioning (https://semver.org/) # Note that when this chart is published to https://github.com/openshift-helm-charts/charts # it will follow the RHDH versioning 1.y.z -version: 4.4.0 +version: 4.4.1 diff --git a/charts/backstage/README.md b/charts/backstage/README.md index c8c47096..63ac12bf 100644 --- a/charts/backstage/README.md +++ b/charts/backstage/README.md @@ -1,7 +1,7 @@ # RHDH Backstage Helm Chart for OpenShift -![Version: 4.4.0](https://img.shields.io/badge/Version-4.4.0-informational?style=flat-square) +![Version: 4.4.1](https://img.shields.io/badge/Version-4.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) A Helm chart for deploying Red Hat Developer Hub, which is a Red Hat supported version of Backstage. diff --git a/charts/backstage/templates/_partials.tpl b/charts/backstage/templates/_partials.tpl index dc3d91e0..c03526e2 100644 --- a/charts/backstage/templates/_partials.tpl +++ b/charts/backstage/templates/_partials.tpl @@ -2,14 +2,14 @@ {{- $config := include "orchestrator.plugins.config" . | fromYaml }} plugins: - disabled: false - package: "{{ $config.orchestratorPlugins.scope }}/{{ $config.orchestratorPlugins.orchestratorBackend.package }}" + package: "{{ $config.orchestratorPlugins.orchestratorBackend.package }}" integrity: "{{ $config.orchestratorPlugins.orchestratorBackend.integrity }}" pluginConfig: orchestrator: dataIndexService: url: http://sonataflow-platform-data-index-service.{{ .Release.Namespace }} - disabled: false - package: "{{ $config.orchestratorPlugins.scope }}/{{ $config.orchestratorPlugins.orchestrator.package }}" + package: "{{ $config.orchestratorPlugins.orchestrator.package }}" integrity: "{{ $config.orchestratorPlugins.orchestrator.integrity }}" pluginConfig: dynamicPlugins: @@ -25,14 +25,14 @@ plugins: text: Orchestrator path: /orchestrator - disabled: false - package: "{{ $config.orchestratorPlugins.scope }}/{{ $config.orchestratorPlugins.scaffolderBackendOrchestrator.package }}" + package: "{{ $config.orchestratorPlugins.scaffolderBackendOrchestrator.package }}" integrity: "{{ $config.orchestratorPlugins.scaffolderBackendOrchestrator.integrity }}" pluginConfig: orchestrator: dataIndexService: url: http://sonataflow-platform-data-index-service.{{ .Release.Namespace }} - disabled: false - package: "{{ $config.orchestratorPlugins.scope }}/{{ $config.orchestratorPlugins.orchestratorFormWidgets.package }}" + package: "{{ $config.orchestratorPlugins.orchestratorFormWidgets.package }}" integrity: "{{ $config.orchestratorPlugins.orchestratorFormWidgets.integrity }}" pluginConfig: dynamicPlugins: @@ -43,15 +43,15 @@ plugins: orchestratorPlugins: scope: "@redhat" orchestrator: - package: "backstage-plugin-orchestrator@1.6.0" + package: "https://npm.registry.redhat.com/@redhat/backstage-plugin-orchestrator/-/backstage-plugin-orchestrator-1.6.0.tgz" integrity: sha512-fOSJv2PgtD2urKwBM7p9W6gV/0UIHSf4pkZ9V/wQO0eg0Zi5Mys/CL1ba3nO9x9l84MX11UBZ2r7PPVJPrmOtw== orchestratorBackend: - package: "backstage-plugin-orchestrator-backend-dynamic@1.6.0" + package: "https://npm.registry.redhat.com/@redhat/backstage-plugin-orchestrator-backend-dynamic/-/backstage-plugin-orchestrator-backend-dynamic-1.6.0.tgz" integrity: sha512-Kr55YbuVwEADwGef9o9wyimcgHmiwehPeAtVHa9g2RQYoSPEa6BeOlaPzB6W5Ke3M2bN/0j0XXtpLuvrlXQogA== scaffolderBackendOrchestrator: - package: "backstage-plugin-scaffolder-backend-module-orchestrator-dynamic@1.6.0" + package: "https://npm.registry.redhat.com/@redhat/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic/-/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic-1.6.0.tgz" integrity: sha512-Bueeix4661fXEnfJ9y31Yw91LXJgw6hJUG7lPVdESCi9VwBCjDB9Rm8u2yPqP8sriwr0OMtKtqD+Odn3LOPyVw== orchestratorFormWidgets: - package: "backstage-plugin-orchestrator-form-widgets@1.6.0" + package: "https://npm.registry.redhat.com/@redhat/backstage-plugin-orchestrator-form-widgets/-/backstage-plugin-orchestrator-form-widgets-1.6.0.tgz" integrity: sha512-Tqn6HO21Q1TQ7TFUoRhwBVCtSBzbQYz+OaanzzIB0R24O6YtVx3wR7Chtr5TzC05Vz5GkBO1+FZid8BKpqljgA== {{- end }} \ No newline at end of file diff --git a/charts/backstage/templates/dynamic-plugins-configmap.yaml b/charts/backstage/templates/dynamic-plugins-configmap.yaml index a8af0614..27547a95 100644 --- a/charts/backstage/templates/dynamic-plugins-configmap.yaml +++ b/charts/backstage/templates/dynamic-plugins-configmap.yaml @@ -21,16 +21,3 @@ data: {{- $_ := set $dynamic "plugins" $plugins }} {{- include "common.tplvalues.render" (dict "value" $dynamic "context" $) | nindent 4 }} - ---- -{{- if .Values.orchestrator.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ .Release.Name}}-dynamic-plugins-npmrc - namespace: {{ .Release.Namespace }} -type: Opaque -stringData: - .npmrc: | - @redhat:registry=https://npm.registry.redhat.com -{{- end }} \ No newline at end of file