Skip to content

Commit f7e6f67

Browse files
authored
Merge branch 'main' into RHIDP-5409-consistent-titles-subtitles
2 parents 1d4fbf3 + fd18de9 commit f7e6f67

File tree

5 files changed

+39
-7
lines changed

5 files changed

+39
-7
lines changed

modules/configuring/proc-provisioning-your-custom-configuration.adoc

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,28 @@ It contains one secret per line in `KEY=value` form.
2121
. Author your custom `{my-app-config-file}` file.
2222
This is the main {product-short} configuration file.
2323
+
24-
You can start with an empty file to use the default configuration.
24+
The `baseUrl` field is mandatory in your `{my-app-config-file}` file to ensure proper functionality of {product-short}. You must specify the `baseUrl` in both the `app` and `backend` sections to avoid errors during initialization.
25+
+
26+
.Configuring the `baseUrl` in `{my-app-config-file}`
27+
====
28+
[source,yaml,subs="+attributes,+quotes"]
29+
----
30+
app:
31+
title: {product}
32+
baseUrl: {my-product-url}
33+
34+
backend:
35+
auth:
36+
externalAccess:
37+
- type: legacy
38+
options:
39+
subject: legacy-default-config
40+
secret: "${BACKEND_SECRET}"
41+
baseUrl: {my-product-url}
42+
cors:
43+
origin: {my-product-url}
44+
----
45+
====
2546
+
2647
Optionally, enter your configuration such as:
2748

modules/dynamic-plugins/con-preinstalled-dynamic-plugins.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ The following preinstalled dynamic plugins are enabled by default:
1212
* `@backstage-community/plugin-scaffolder-backend-module-regex`
1313
* `@backstage/plugin-techdocs-backend`
1414
* `@backstage/plugin-techdocs`
15+
* `@red-hat-developer-hub/backstage-plugin-dynamic-home-page`
1516

1617
The dynamic plugins that require custom configuration are disabled by default.
1718

modules/dynamic-plugins/ref-rh-supported-plugins.adoc

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

44
= {company-name} supported plugins
55

6-
{company-name} supports the following 18 plugins:
6+
{company-name} supports the following 20 plugins:
77

88
[%header,cols=4*]
99
|===
@@ -36,6 +36,10 @@
3636
`ARGOCD_AUTH_TOKEN2`
3737

3838

39+
|Dynamic Home Page |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-dynamic-home-page/v/1.0.1[@red-hat-developer-hub/backstage-plugin-dynamic-home-page]` |1.0.1
40+
|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page`
41+
42+
3943
|GitHub |`https://npmjs.com/package/@backstage/plugin-catalog-backend-module-github/v/0.7.6[@backstage/plugin-catalog-backend-module-github]` |0.7.6
4044
|`./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic`
4145

@@ -74,6 +78,10 @@
7478
`K8S_CLUSTER_TOKEN`
7579

7680

81+
|Kubernetes |`https://npmjs.com/package/@backstage-community/plugin-scaffolder-backend-module-kubernetes/v/2.2.2[@backstage-community/plugin-scaffolder-backend-module-kubernetes]` |2.2.2
82+
|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic`
83+
84+
7785
|OCM |`https://npmjs.com/package/@backstage-community/plugin-ocm/v/5.2.4[@backstage-community/plugin-ocm]` |5.2.4
7886
|`./dynamic-plugins/dist/backstage-community-plugin-ocm`
7987

@@ -96,7 +104,7 @@
96104
|`./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-quay-dynamic`
97105

98106

99-
|RBAC |`https://npmjs.com/package/@backstage-community/plugin-rbac/v/1.33.2[@backstage-community/plugin-rbac]` |1.33.2
107+
|RBAC |`https://npmjs.com/package/@backstage-community/plugin-rbac/v/1.33.4[@backstage-community/plugin-rbac]` |1.33.4
100108
|`./dynamic-plugins/dist/backstage-community-plugin-rbac`
101109

102110

@@ -116,7 +124,7 @@
116124
|`./dynamic-plugins/dist/backstage-plugin-techdocs-backend-dynamic`
117125

118126

119-
|Tekton |`https://npmjs.com/package/@backstage-community/plugin-tekton/v/3.16.2[@backstage-community/plugin-tekton]` |3.16.2
127+
|Tekton |`https://npmjs.com/package/@backstage-community/plugin-tekton/v/3.17.0[@backstage-community/plugin-tekton]` |3.17.0
120128
|`./dynamic-plugins/dist/backstage-community-plugin-tekton`
121129

122130

modules/dynamic-plugins/rhdh-supported-plugins.csv

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
"Analytics Provider Segment ","@backstage-community/plugin-analytics-provider-segment","Frontend","1.10.2","Production","./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment","`SEGMENT_WRITE_KEY`;`SEGMENT_TEST_MODE`;","Enabled"
33
"Argo CD ","@roadiehq/backstage-plugin-argo-cd","Frontend","2.8.4","Production","./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd",";","Disabled"
44
"Argo CD ","@roadiehq/backstage-plugin-argo-cd-backend","Backend","3.2.3","Production","./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic","`ARGOCD_USERNAME`;`ARGOCD_PASSWORD`;`ARGOCD_INSTANCE1_URL`;`ARGOCD_AUTH_TOKEN`;`ARGOCD_INSTANCE2_URL`;`ARGOCD_AUTH_TOKEN2`;","Disabled"
5+
"Dynamic Home Page ","@red-hat-developer-hub/backstage-plugin-dynamic-home-page","Frontend","1.0.1","Production","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page",";","Enabled"
56
"GitHub ","@backstage/plugin-catalog-backend-module-github","Backend","0.7.6","Production","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic","`GITHUB_ORG`;","Disabled"
67
"GitHub Org ","@backstage/plugin-catalog-backend-module-github-org","Backend","0.3.3","Production","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic","`GITHUB_URL`;`GITHUB_ORG`;","Disabled"
78
"Keycloak ","@backstage-community/plugin-catalog-backend-module-keycloak","Backend","3.2.2","Production","./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic","`KEYCLOAK_BASE_URL`;`KEYCLOAK_LOGIN_REALM`;`KEYCLOAK_REALM`;`KEYCLOAK_CLIENT_ID`;`KEYCLOAK_CLIENT_SECRET`;","Disabled"
89
"Kubernetes ","@backstage/plugin-kubernetes-backend","Backend","0.18.7","Production","./dynamic-plugins/dist/backstage-plugin-kubernetes-backend-dynamic","`K8S_CLUSTER_NAME`;`K8S_CLUSTER_URL`;`K8S_CLUSTER_TOKEN`;","Disabled"
10+
"Kubernetes ","@backstage-community/plugin-scaffolder-backend-module-kubernetes","Backend","2.2.2","Production","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic",";","Disabled"
911
"OCM ","@backstage-community/plugin-ocm","Frontend","5.2.4","Production","./dynamic-plugins/dist/backstage-community-plugin-ocm",";","Disabled"
1012
"OCM ","@backstage-community/plugin-ocm-backend","Backend","5.2.3","Production","./dynamic-plugins/dist/backstage-community-plugin-ocm-backend-dynamic","`OCM_HUB_NAME`;`OCM_HUB_URL`;`OCM_SA_TOKEN`;","Disabled"
1113
"Quay ","@backstage-community/plugin-quay","Frontend","1.14.4","Production","./dynamic-plugins/dist/backstage-community-plugin-quay",";","Disabled"
1214
"Quay ","@backstage-community/plugin-scaffolder-backend-module-quay","Backend","2.2.2","Production","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-quay-dynamic",";","Enabled"
13-
"RBAC ","@backstage-community/plugin-rbac","Frontend","1.33.2","Production","./dynamic-plugins/dist/backstage-community-plugin-rbac",";","Disabled"
15+
"RBAC ","@backstage-community/plugin-rbac","Frontend","1.33.4","Production","./dynamic-plugins/dist/backstage-community-plugin-rbac",";","Disabled"
1416
"Regex ","@backstage-community/plugin-scaffolder-backend-module-regex","Backend","2.2.3","Production","./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-regex-dynamic",";","Enabled"
1517
"Signals ","@backstage/plugin-signals-backend","Backend","0.2.2","Production","./dynamic-plugins/dist/backstage-plugin-signals-backend-dynamic",";","Disabled"
16-
"Tekton ","@backstage-community/plugin-tekton","Frontend","3.16.2","Production","./dynamic-plugins/dist/backstage-community-plugin-tekton",";","Disabled"
18+
"Tekton ","@backstage-community/plugin-tekton","Frontend","3.17.0","Production","./dynamic-plugins/dist/backstage-community-plugin-tekton",";","Disabled"
1719
"Topology ","@backstage-community/plugin-topology","Frontend","1.29.7","Production","./dynamic-plugins/dist/backstage-community-plugin-topology",";","Disabled"
1820
"3scale ","@backstage-community/plugin-3scale-backend","Backend","3.0.3","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-3scale-backend-dynamic","`THREESCALE_BASE_URL`;`THREESCALE_ACCESS_TOKEN`;","Disabled"
1921
"Ansible Automation Platform (AAP) ","@janus-idp/backstage-plugin-aap-backend","Backend","2.2.0","Red Hat Tech Preview","./dynamic-plugins/dist/janus-idp-backstage-plugin-aap-backend-dynamic","`AAP_BASE_URL`;`AAP_AUTH_TOKEN`;","Disabled"

modules/dynamic-plugins/rhdh-supported-plugins.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ for j in $jsons; do
139139

140140
# echo "Path = $Path"
141141
# shellcheck disable=SC2016
142-
found_in_default_config1=$(yq -r --arg Path "${Path/-dynamic/}" '.plugins[] | select(.package == $Path)' /tmp/backstage-showcase/dynamic-plugins.default.yaml)
142+
found_in_default_config1=$(yq -r --arg Path "${Path%-dynamic}" '.plugins[] | select(.package == $Path)' /tmp/backstage-showcase/dynamic-plugins.default.yaml)
143143
# shellcheck disable=SC2016
144144
found_in_default_config2=$(yq -r --arg Path "${Path}" '.plugins[] | select(.package == $Path)' /tmp/backstage-showcase/dynamic-plugins.default.yaml)
145145
# echo "[DEBUG] default configs:"

0 commit comments

Comments
 (0)