Skip to content
Open
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
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: ❓ Janus IDP Community Slack
url: https://join.slack.com/t/janus-idp/shared_invite/zt-1pxtehxom-fCFtF9rRe3vFqUiFFeAkmg
about: Please ask and answer questions here.
- name: Report Issues on JIRA
url: https://issues.redhat.com/browse/RHIDP
about: To report issues against this chart, please use JIRA (not GH issues).
7 changes: 0 additions & 7 deletions .github/workflows/on-new-issue.yaml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove this file completely? We are not using GH issues.

Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@ on:
- opened

jobs:
add-to-project:
# https://github.com/janus-idp/.github/blob/main/.github/workflows/add-to-project.yaml
uses: janus-idp/.github/.github/workflows/add-to-project.yaml@main
with:
project_id: 2
secrets: inherit

add-jira-label:
runs-on: ubuntu-latest
permissions:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2022 The Janus-IDP Authors
Copyright 2022 The RHDH Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion charts/backstage/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0
version: 4.9.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
version: 4.9.1
version: 4.9.2

Needs a new version bump with the latest changes on main.

24 changes: 11 additions & 13 deletions charts/backstage/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# RHDH Backstage Helm Chart for OpenShift

![Version: 4.9.0](https://img.shields.io/badge/Version-4.9.0-informational?style=flat-square)
![Version: 4.9.1](https://img.shields.io/badge/Version-4.9.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.
Expand Down Expand Up @@ -30,7 +30,7 @@ helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo add backstage https://backstage.github.io/charts
helm repo add redhat-developer https://redhat-developer.github.io/rhdh-chart

helm install my-backstage redhat-developer/backstage --version 4.9.0
helm install my-backstage redhat-developer/backstage --version 4.9.1
```

## Introduction
Expand Down Expand Up @@ -92,8 +92,6 @@ helm upgrade -i <release_name> redhat-developer/backstage

### Installing from an OCI Registry

Note: this repo replaces https://github.com/janus-idp/helm-backstage, which has been deprecated in Feb 2024.

Charts are also available in OCI format. The list of available releases can be found [here](https://quay.io/repository/rhdh/chart?tab=tags).

Install one of the available versions:
Expand Down Expand Up @@ -175,7 +173,7 @@ Kubernetes: `>= 1.27.0-0`
| global.catalogIndex | Catalog index configuration for automatic plugin discovery. The `install-dynamic-plugins.py` script pulls this image if the `CATALOG_INDEX_IMAGE` environment variable is set. The `dynamic-plugins.default.yaml` file will be extracted and written to `dynamic-plugins-root` volume mount. | object | `{"image":{"registry":"quay.io","repository":"rhdh/plugin-catalog-index","tag":"1.9"}}` |
| global.clusterRouterBase | Shorthand for users who do not want to specify a custom HOSTNAME. Used ONLY with the DEFAULT upstream.backstage.appConfig value and with OCP Route enabled. | string | `"apps.example.com"` |
| global.dynamic.includes | Array of YAML files listing dynamic plugins to include with those listed in the `plugins` field. Relative paths are resolved from the working directory of the initContainer that will install the plugins (`/opt/app-root/src`). | list | `["dynamic-plugins.default.yaml"]` |
| global.dynamic.includes[0] | List of dynamic plugins included inside the `janus-idp/backstage-showcase` container image, some of which are disabled by default. This file ONLY works with the `janus-idp/backstage-showcase` container image. | string | `"dynamic-plugins.default.yaml"` |
| global.dynamic.includes[0] | List of dynamic plugins included inside the `rhdh` container image, some of which are disabled by default. This file ONLY works with the `rhdh` container image. | string | `"dynamic-plugins.default.yaml"` |
| global.dynamic.plugins | List of dynamic plugins, possibly overriding the plugins listed in `includes` files. Every item defines the plugin `package` as a [NPM package spec](https://docs.npmjs.com/cli/v10/using-npm/package-spec), an optional `pluginConfig` with plugin-specific backstage configuration, and an optional `disabled` flag to disable/enable a plugin listed in `includes` files. It also includes an `integrity` field that is used to verify the plugin package [integrity](https://w3c.github.io/webappsec-subresource-integrity/#integrity-metadata-description). | list | `[]` |
| global.host | Custom hostname shorthand, overrides `global.clusterRouterBase`, `upstream.ingress.host`, `route.host`, and url values in `upstream.backstage.appConfig`. | string | `""` |
| nameOverride | | string | `"developer-hub"` |
Expand Down Expand Up @@ -221,19 +219,19 @@ Kubernetes: `>= 1.27.0-0`
| upstream | Upstream Backstage [chart configuration](https://github.com/backstage/charts/blob/main/charts/backstage/values.yaml) | object | Use Openshift compatible settings |
| upstream.backstage.extraVolumes[0] | Ephemeral volume that will contain the dynamic plugins installed by the initContainer below at start. | object | `{"ephemeral":{"volumeClaimTemplate":{"spec":{"accessModes":["ReadWriteOnce"],"resources":{"requests":{"storage":"5Gi"}}}}},"name":"dynamic-plugins-root"}` |
| upstream.backstage.extraVolumes[0].ephemeral.volumeClaimTemplate.spec.resources.requests.storage | Size of the volume that will contain the dynamic plugins. It should be large enough to contain all the plugins. | string | `"5Gi"` |
| upstream.backstage.initContainers[0].image | Image used by the initContainer to install dynamic plugins into the `dynamic-plugins-root` volume mount. It could be replaced by a custom image based on this one. | string | `quay.io/janus-idp/backstage-showcase:latest` |
| upstream.backstage.initContainers[0].image | Image used by the initContainer to install dynamic plugins into the `dynamic-plugins-root` volume mount. It could be replaced by a custom image based on this one. | string | `quay.io/rhdh-community/rhdh:next` |

## Opinionated Backstage deployment

This chart defaults to an opinionated deployment of Backstage that provides user with a usable Backstage instance out of the box.

Features enabled by the default chart configuration:

1. Uses [janus-idp/backstage-showcase](https://github.com/janus-idp/backstage-showcase/) that pre-loads a lot of useful plugins and features
1. Uses [rhdh](https://github.com/redhat-developer/rhdh/) that pre-loads a lot of useful plugins and features
2. Exposes a `Route` for easy access to the instance
3. Enables OpenShift-compatible PostgreSQL database storage

For additional instance features please consult the [documentation for `janus-idp/backstage-showcase`](https://github.com/janus-idp/backstage-showcase/tree/main/showcase-docs).
For additional instance features please consult the [documentation for `rhdh`](https://github.com/redhat-developer/rhdh/tree/main/showcase-docs).

Additional features can be enabled by extending the default configuration at:

Expand All @@ -248,10 +246,10 @@ upstream:

## Features

This charts defaults to using the [latest Janus-IDP Backstage Showcase image](https://quay.io/janus-idp/backstage-showcase:latest) that is OpenShift compatible:
This charts defaults to using the [RHDH image](https://quay.io/rhdh-community/rhdh:next) that is OpenShift compatible:

```console
quay.io/janus-idp/backstage-showcase:latest
quay.io/rhdh-community/rhdh:next
```

Additionally this chart enhances the upstream Backstage chart with following OpenShift-specific features:
Expand Down Expand Up @@ -294,11 +292,11 @@ upstream:
backstage:
appConfig:
app:
baseUrl: 'https://{{- include "janus-idp.hostname" . }}'
baseUrl: 'https://{{- include "rhdh.hostname" . }}'
backend:
baseUrl: 'https://{{- include "janus-idp.hostname" . }}'
baseUrl: 'https://{{- include "rhdh.hostname" . }}'
cors:
origin: 'https://{{- include "janus-idp.hostname" . }}'
origin: 'https://{{- include "rhdh.hostname" . }}'
```

### Catalog Index Configuration
Expand Down
16 changes: 7 additions & 9 deletions charts/backstage/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ helm upgrade -i <release_name> redhat-developer/backstage

### Installing from an OCI Registry

Note: this repo replaces https://github.com/janus-idp/helm-backstage, which has been deprecated in Feb 2024.

Charts are also available in OCI format. The list of available releases can be found [here](https://quay.io/repository/rhdh/chart?tab=tags).

Install one of the available versions:
Expand Down Expand Up @@ -162,11 +160,11 @@ This chart defaults to an opinionated deployment of Backstage that provides user

Features enabled by the default chart configuration:

1. Uses [janus-idp/backstage-showcase](https://github.com/janus-idp/backstage-showcase/) that pre-loads a lot of useful plugins and features
1. Uses [rhdh](https://github.com/redhat-developer/rhdh/) that pre-loads a lot of useful plugins and features
2. Exposes a `Route` for easy access to the instance
3. Enables OpenShift-compatible PostgreSQL database storage

For additional instance features please consult the [documentation for `janus-idp/backstage-showcase`](https://github.com/janus-idp/backstage-showcase/tree/main/showcase-docs).
For additional instance features please consult the [documentation for `rhdh`](https://github.com/redhat-developer/rhdh/tree/main/showcase-docs).

Additional features can be enabled by extending the default configuration at:

Expand All @@ -181,10 +179,10 @@ upstream:

## Features

This charts defaults to using the [latest Janus-IDP Backstage Showcase image](https://quay.io/janus-idp/backstage-showcase:latest) that is OpenShift compatible:
This charts defaults to using the [RHDH image](https://quay.io/rhdh-community/rhdh:next) that is OpenShift compatible:

```console
quay.io/janus-idp/backstage-showcase:latest
quay.io/rhdh-community/rhdh:next
```

Additionally this chart enhances the upstream Backstage chart with following OpenShift-specific features:
Expand Down Expand Up @@ -227,11 +225,11 @@ upstream:
backstage:
appConfig:
app:
baseUrl: 'https://{{"{{"}}- include "janus-idp.hostname" . {{"}}"}}'
baseUrl: 'https://{{"{{"}}- include "rhdh.hostname" . {{"}}"}}'
backend:
baseUrl: 'https://{{"{{"}}- include "janus-idp.hostname" . {{"}}"}}'
baseUrl: 'https://{{"{{"}}- include "rhdh.hostname" . {{"}}"}}'
cors:
origin: 'https://{{"{{"}}- include "janus-idp.hostname" . {{"}}"}}'
origin: 'https://{{"{{"}}- include "rhdh.hostname" . {{"}}"}}'
```

### Catalog Index Configuration
Expand Down
6 changes: 3 additions & 3 deletions charts/backstage/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{/*
Returns custom hostname
*/}}
{{- define "janus-idp.hostname" -}}
{{- define "rhdh.hostname" -}}
{{- if .Values.global.host -}}
{{- .Values.global.host -}}
{{- else if .Values.global.clusterRouterBase -}}
Expand All @@ -14,7 +14,7 @@ Returns custom hostname
{{/*
Returns a secret name for service to service auth
*/}}
{{- define "janus-idp.backend-secret-name" -}}
{{- define "rhdh.backend-secret-name" -}}
{{- if .Values.global.auth.backend.existingSecret -}}
{{- .Values.global.auth.backend.existingSecret -}}
{{- else -}}
Expand All @@ -25,7 +25,7 @@ Returns a secret name for service to service auth
{{/*
Sets the secretKeyRef name for Backstage to the PostgreSQL existing secret if it present
*/}}
{{- define "janus-idp.postgresql.secretName" -}}
{{- define "rhdh.postgresql.secretName" -}}
{{- if ((((.Values).global).postgresql).auth).existingSecret -}}
{{- .Values.global.postgresql.auth.existingSecret -}}
{{- else if .Values.postgresql.auth.existingSecret -}}
Expand Down
2 changes: 1 addition & 1 deletion charts/backstage/templates/route.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
{{- if $host }}
host: {{ $host }}
{{- else }}
host: {{ include "janus-idp.hostname" . }}
host: {{ include "rhdh.hostname" . }}
{{- end }}
{{- if .Values.route.path }}
path: {{ .Values.route.path }}
Expand Down
10 changes: 5 additions & 5 deletions charts/backstage/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@
"appConfig": {
"default": {
"app": {
"baseUrl": "https://{{- include \"janus-idp.hostname\" . }}"
"baseUrl": "https://{{- include \"rhdh.hostname\" . }}"
},
"auth": {
"providers": {}
Expand All @@ -1226,9 +1226,9 @@
}
]
},
"baseUrl": "https://{{- include \"janus-idp.hostname\" . }}",
"baseUrl": "https://{{- include \"rhdh.hostname\" . }}",
"cors": {
"origin": "https://{{- include \"janus-idp.hostname\" . }}"
"origin": "https://{{- include \"rhdh.hostname\" . }}"
},
"database": {
"connection": {
Expand Down Expand Up @@ -2716,7 +2716,7 @@
"valueFrom": {
"secretKeyRef": {
"key": "backend-secret",
"name": "{{ include \"janus-idp.backend-secret-name\" $ }}"
"name": "{{ include \"rhdh.backend-secret-name\" $ }}"
}
}
},
Expand All @@ -2725,7 +2725,7 @@
"valueFrom": {
"secretKeyRef": {
"key": "postgres-password",
"name": "{{- include \"janus-idp.postgresql.secretName\" . }}"
"name": "{{- include \"rhdh.postgresql.secretName\" . }}"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion charts/backstage/values.schema.tmpl.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"backstage": {
"image": {
"registry": "quay.io",
"repository": "janus-idp/redhat-backstage-build",
"repository": "rhdh-community/rhdh",
"tag": "latest",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"tag": "latest",
"tag": "next",

"pullPolicy": ""
}
Expand Down
16 changes: 8 additions & 8 deletions charts/backstage/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ global:
# -- Array of YAML files listing dynamic plugins to include with those listed in the `plugins` field.
# Relative paths are resolved from the working directory of the initContainer that will install the plugins (`/opt/app-root/src`).
includes:
# -- List of dynamic plugins included inside the `janus-idp/backstage-showcase` container image, some of which are disabled by default.
# This file ONLY works with the `janus-idp/backstage-showcase` container image.
# -- List of dynamic plugins included inside the `rhdh` container image, some of which are disabled by default.
# This file ONLY works with the `rhdh` container image.
- "dynamic-plugins.default.yaml"

# -- List of dynamic plugins, possibly overriding the plugins listed in `includes` files.
Expand Down Expand Up @@ -63,11 +63,11 @@ upstream:
providers: {}
app:
# Please update to match host in case you don't want to configure hostname via `global.clusterRouterBase` or `global.host` if not deploying on an openshift cluster.
baseUrl: 'https://{{- include "janus-idp.hostname" . }}'
baseUrl: 'https://{{- include "rhdh.hostname" . }}'
backend:
baseUrl: 'https://{{- include "janus-idp.hostname" . }}'
baseUrl: 'https://{{- include "rhdh.hostname" . }}'
cors:
origin: 'https://{{- include "janus-idp.hostname" . }}'
origin: 'https://{{- include "rhdh.hostname" . }}'
database:
connection:
password: ${POSTGRESQL_ADMIN_PASSWORD}
Expand Down Expand Up @@ -139,12 +139,12 @@ upstream:
valueFrom:
secretKeyRef:
key: backend-secret
name: '{{ include "janus-idp.backend-secret-name" $ }}'
name: '{{ include "rhdh.backend-secret-name" $ }}'
- name: POSTGRESQL_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
key: postgres-password
name: '{{- include "janus-idp.postgresql.secretName" . }}'
name: '{{- include "rhdh.postgresql.secretName" . }}'
args:
# This additional `app-config`` file is generated by the initContainer below, and contains the merged configuration of installed dynamic plugins.
- "--config"
Expand Down Expand Up @@ -212,7 +212,7 @@ upstream:
type: "RuntimeDefault"
# -- Image used by the initContainer to install dynamic plugins into the `dynamic-plugins-root` volume mount.
# It could be replaced by a custom image based on this one.
# @default -- `quay.io/janus-idp/backstage-showcase:latest`
# @default -- `quay.io/rhdh-community/rhdh:next`
image: '{{ include "backstage.image" . }}'
command:
- ./install-dynamic-plugins.sh
Expand Down
2 changes: 1 addition & 1 deletion charts/orchestrator-software-templates-infra/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kubeVersion: ">= 1.25.0-0"
type: application
sources:
- https://github.com/redhat-developer/rhdh-software-templates-infrastructure
version: 0.3.0
version: 0.3.1
maintainers:
- name: Red Hat Developer Hub Team
url: https://github.com/redhat-developer/rhdh-chart
4 changes: 2 additions & 2 deletions charts/orchestrator-software-templates-infra/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Orchestrator Software Templates Infra Chart for OpenShift (Community Version)

![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square)
![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square)
![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

A Helm chart to install Openshift GitOps and Openshift Pipelines, which are required operators for installing the Orchestrator Software Templates to be available on RHDH.
Expand All @@ -25,7 +25,7 @@ Kubernetes: `>= 1.25.0-0`
```console
helm repo add redhat-developer https://redhat-developer.github.io/rhdh-chart

helm install my-orchestrator-software-templates-infra redhat-developer/orchestrator-software-templates-infra --version 0.3.0
helm install my-orchestrator-software-templates-infra redhat-developer/orchestrator-software-templates-infra --version 0.3.1
```

> **Tip**: List all releases using `helm list`
Expand Down
Loading
Loading