Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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 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
Comment thread
Fortune-Ndlovu marked this conversation as resolved.
Outdated
10 changes: 5 additions & 5 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 @@ -294,11 +294,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/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,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" -}}
Comment thread
Fortune-Ndlovu marked this conversation as resolved.
{{- 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
10 changes: 5 additions & 5 deletions charts/backstage/values.yaml
Original file line number Diff line number Diff line change
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
2 changes: 1 addition & 1 deletion charts/orchestrator-software-templates/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ kubeVersion: ">= 1.25.0-0"
type: application
sources:
- https://github.com/redhat-developer/rhdh-chart
version: 0.2.0
version: 0.2.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/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Orchestrator Software Templates Chart for Red Hat Developer Hub

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

This Helm chart deploys the Orchestrator Software Templates for Red Hat Developer Hub (RHDH) and other necessary GitOps configurations.
Expand Down Expand Up @@ -78,7 +78,7 @@ After configuring all prerequisites, you can install the chart with the followin
```console
helm repo add redhat-developer https://redhat-developer.github.io/rhdh-chart

helm install my-orchestrator-templates redhat-developer/orchestrator-software-templates --version 0.2.0
helm install my-orchestrator-templates redhat-developer/orchestrator-software-templates --version 0.2.1
```

Now, follow the instruction on the post-installation Notes. They will include the steps to create a custom values.yaml file to allow you to update the backstage chart
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,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" . }}'
- name: NODE_TLS_REJECT_UNAUTHORIZED
value: "0"

Expand Down
2 changes: 1 addition & 1 deletion docs/external-db.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ upstream:
valueFrom:
secretKeyRef:
key: backend-secret
name: '{{ include "janus-idp.backend-secret-name" $ }}'
name: '{{ include "rhdh.backend-secret-name" $ }}'
extraVolumeMounts:
- mountPath: /opt/app-root/src/dynamic-plugins-root
name: dynamic-plugins-root
Expand Down
Loading