Skip to content

Commit b8f4d0a

Browse files
nickboldtrhdh-bot
andauthored
chore: prepare to move up to 1.10 in main branch; replace hardcoded 1.9 refs (#2064)
* chore: move up to 1.10 in main branch; replace hardcoded 1.9 refs Signed-off-by: Nick Boldt <nboldt@redhat.com> * revert to ocp 4.21 for links Signed-off-by: rhdh-bot service account <rhdh-bot@redhat.com> * replace hardcoded links with /latest/ to resolve obsolete (1.8, 1.9) and future 1.10 links before we're ready to branch Signed-off-by: rhdh-bot service account <rhdh-bot@redhat.com> * switch back to 1.9 until we branch Signed-off-by: rhdh-bot service account <rhdh-bot@redhat.com> --------- Signed-off-by: Nick Boldt <nboldt@redhat.com> Signed-off-by: rhdh-bot service account <rhdh-bot@redhat.com> Co-authored-by: rhdh-bot service account <rhdh-bot@redhat.com>
1 parent 7cc2664 commit b8f4d0a

8 files changed

+31
-29
lines changed

artifacts/attributes.adoc

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,29 @@
1616
:product-local: Red Hat Developer Hub Local
1717
:product-local-very-short: RHDH Local
1818
:product-version: 1.9
19-
:product-bundle-version: 1.9.0
20-
:product-chart-version: 1.9.0
19+
// TODO change to 1.10 when we create the release-1.10 branch
20+
// :product-version: 1.10
21+
:product-bundle-version: 1.10.0
22+
:product-chart-version: 1.10.0
2123
:product-backstage-version: 1.45.3
22-
:product-version-next: 1.10
24+
// after 1.10 we skip to 2.1
25+
:product-version-next: 2.1
2326
:product-custom-resource-type: Backstage
2427
:product-docs-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub
2528
:product-docs-link: link:{product-docs-url}/{product-version}
2629
:backstage: Backstage
2730
// Minimum and current latest supported versions
2831
:ansible-automation-platform-version: 2.6
2932
:keycloak-version: 26.0
30-
// k8s and OCP min versions are aligned (OCP 4.16 is based on k8s 1.29)
31-
// when we drop support for 4.16, this moves to 1.31
32-
:kubernetes-version: 1.29
33-
:ocp-version-min: 4.16
34-
:ocp-version: 4.20
33+
// k8s and OCP min versions are aligned (OCP 4.18 is based on k8s 1.31)
34+
:kubernetes-version: 1.31
35+
:ocp-version-min: 4.18
36+
:ocp-version: 4.21
3537
:osd-version: 4
3638
:rhoserverless-version: 1.37.1
3739
:rhoserverless-version-major: 1.37
3840
:rhoserverless-logic-version: 1.37.2
39-
:orchestrator-plugin-version: 1.9.0
41+
:orchestrator-plugin-version: 1.10.0
4042

4143
// Support levels
4244
:developer-preview: Developer Preview
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
:_mod-docs-content-type: SNIPPET
1+
:_mod-docs-content-type: SNIPPET
22

33
The `<tag>` variable is your {product-very-short} application{apos}s version of {backstage} and the plugin version, in the format: `bs_<backstage-version>__<plugin-version>` (note the double underscore delimiter).
44

55
* To find the correct image tag for `<tag>`:
6-
.. Look in the link:https://docs.redhat.com/en/documentation/red_hat_developer_hub/1.9/html/red_hat_developer_hub_release_notes/pr01[{product-very-short} release notes preface] for your {backstage} version.
7-
.. Locate the plugin version for paths starting with `oci://ghcr.io` within one of the tables in the {dynamic-plugins-reference-book-link}[Dynamic Plugins Reference guide].
6+
.. Look in the link:https://docs.redhat.com/en/documentation/red_hat_developer_hub/latest/html/red_hat_developer_hub_release_notes/pr01[{product-very-short} release notes preface] for your {backstage} version.
7+
.. Locate the plugin version for paths starting with `oci://ghcr.io` within one of the tables in the {dynamic-plugins-reference-book-link}[Dynamic Plugins Reference guide].
88
99
For example, because {product-very-short} 1.9 is based on {backstage} 1.45.3, the tag will have the format `bs_1.45.3__<plugin-version>`.
1010

11-
include::snip-tag-for-sha256-tip.adoc[]
11+
include::snip-tag-for-sha256-tip.adoc[]

modules/extend_orchestrator-in-rhdh/proc-install-rhdh-with-orchestrator-in-a-fully-disconnected-ocp-environment-using-the-helm-chart.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ mirror:
2626
- name: registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend@_<digest>_
2727
- name: registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator@_<digest>_
2828
- name: registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets@_<digest>_
29-
29+
3030
helm:
3131
repositories:
3232
- name: openshift-charts
@@ -71,9 +71,9 @@ unpack () {
7171
cd $DIR; tree -d -L 3 -I "usr|root|buildinfo"
7272
}
7373
74-
unpack "registry.access.redhat.com/rhdh/plugin-catalog-index:1.9"
74+
unpack "registry.access.redhat.com/rhdh/plugin-catalog-index:{product-version}"
7575
76-
# you can then find the `dynamic-plugins.default.yaml` under /tmp/registry.access.redhat.com/rhdh/plugin-catalog-index_1.9/dynamic-plugins.default.yaml
76+
# you can then find the `dynamic-plugins.default.yaml` under /tmp/registry.access.redhat.com/rhdh/plugin-catalog-index_{product-version}/dynamic-plugins.default.yaml
7777
----
7878

7979
. Mirror the images in the `ImageSetConfiguration.yaml` file by running the `oc-mirror` command. For example:
@@ -209,9 +209,9 @@ unpack () {
209209
cd $DIR; tree -d -L 3 -I "usr|root|buildinfo"
210210
}
211211
212-
unpack "registry.access.redhat.com/rhdh/plugin-catalog-index:1.9"
212+
unpack "registry.access.redhat.com/rhdh/plugin-catalog-index:{product-version)"
213213
214-
# you can then find the dynamic-plugins.default.yaml under /tmp/registry.access.redhat.com/rhdh/plugin-catalog-index_1.9/dynamic-plugins.default.yaml
214+
# you can then find the dynamic-plugins.default.yaml under /tmp/registry.access.redhat.com/rhdh/plugin-catalog-index_{product-version)/dynamic-plugins.default.yaml
215215
----
216216

217217
.Verification
@@ -223,4 +223,4 @@ unpack "registry.access.redhat.com/rhdh/plugin-catalog-index:1.9"
223223
[NOTE]
224224
====
225225
The successful accessibility of the Orchestrator UI confirms that the underlying components are running and the cluster recognizes the plugin.
226-
====
226+
====

modules/extend_orchestrator-in-rhdh/proc-install-rhdh-with-orchestrator-in-a-fully-disconnected-ocp-environment-using-the-operator.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mirror:
3030
- name: registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend@_<digest>_
3131
- name: registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator@_<digest>_
3232
- name: registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets@_<digest>_
33-
33+
3434
operators:
3535
- catalog: registry.redhat.io/redhat/redhat-operator-index:v<ocp-version>
3636
# For example: registry.redhat.io/redhat/redhat-operator-index:v{ocp-version}
@@ -66,9 +66,9 @@ unpack () {
6666
cd $DIR; tree -d -L 3 -I "usr|root|buildinfo"
6767
}
6868
69-
unpack "registry.access.redhat.com/rhdh/plugin-catalog-index:1.9"
69+
unpack "registry.access.redhat.com/rhdh/plugin-catalog-index:{product-version)"
7070
71-
# you can then find the `dynamic-plugins.default.yaml` under /tmp/registry.access.redhat.com/rhdh/plugin-catalog-index_1.9/dynamic-plugins.default.yaml
71+
# you can then find the `dynamic-plugins.default.yaml` under /tmp/registry.access.redhat.com/rhdh/plugin-catalog-index_{product-version)/dynamic-plugins.default.yaml
7272
----
7373

7474
. Mirror the images in the `ImageSetConfiguration.yaml` file by running the `oc-mirror` command. For example:

modules/extend_orchestrator-in-rhdh/proc-install-rhdh-with-orchestrator-in-a-partially-disconnected-ocp-environment-using-the-helm-chart.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ unpack () {
168168
cd $DIR; tree -d -L 3 -I "usr|root|buildinfo"
169169
}
170170
171-
unpack "registry.access.redhat.com/rhdh/plugin-catalog-index:1.9"
171+
unpack "registry.access.redhat.com/rhdh/plugin-catalog-index:{product-version)"
172172
173-
# you can then find the `dynamic-plugins.default.yaml` under /tmp/registry.access.redhat.com/rhdh/plugin-catalog-index_1.9/dynamic-plugins.default.yaml
173+
# you can then find the `dynamic-plugins.default.yaml` under /tmp/registry.access.redhat.com/rhdh/plugin-catalog-index_{product-version)/dynamic-plugins.default.yaml
174174
----
175175

176176
.Verification

modules/extend_orchestrator-in-rhdh/proc-install-rhdh-with-orchestrator-in-a-partially-disconnected-ocp-environment-using-the-operator.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mirror:
3030
- name: registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend@_<digest>_
3131
- name: registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator@_<digest>_
3232
- name: registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets@_<digest>_
33-
33+
3434
operators:
3535
- catalog: registry.redhat.io/redhat/redhat-operator-index:v<ocp-version>
3636
# For example: registry.redhat.io/redhat/redhat-operator-index:v{ocp-version}
@@ -66,9 +66,9 @@ unpack () {
6666
cd $DIR; tree -d -L 3 -I "usr|root|buildinfo"
6767
}
6868
69-
unpack "registry.access.redhat.com/rhdh/plugin-catalog-index:1.9"
69+
unpack "registry.access.redhat.com/rhdh/plugin-catalog-index:{product-version)"
7070
71-
# you can then find the `dynamic-plugins.default.yaml` under /tmp/registry.access.redhat.com/rhdh/plugin-catalog-index_1.9/dynamic-plugins.default.yaml
71+
# you can then find the `dynamic-plugins.default.yaml` under /tmp/registry.access.redhat.com/rhdh/plugin-catalog-index_{product-version)/dynamic-plugins.default.yaml
7272
----
7373

7474
. Mirror the images in the `ImageSetConfiguration.yaml` file by running the `oc-mirror` command. For example:

modules/shared/proc-configure-front-end-plugin-wiring.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ plugins:
5858
After restarting {product-very-short}, confirm that *Simple Example* appears in the sidebar menu. Click *Simple Example* and verify that the plugin page displays correctly. Navigate to a Component entity page and verify that the *ExampleCard* appears in the *Overview* tab.
5959

6060
.Additional resources
61-
* link:https://docs.redhat.com/en/documentation/red_hat_developer_hub/1.8/html/installing_and_viewing_plugins_in_red_hat_developer_hub/assembly-front-end-plugin-wiring.adoc_rhdh-extensions-plugins[Frontend Plugin Wiring]
61+
* link:https://docs.redhat.com/en/documentation/red_hat_developer_hub/latest/html/installing_and_viewing_plugins_in_red_hat_developer_hub/assembly-front-end-plugin-wiring.adoc_rhdh-extensions-plugins[Frontend Plugin Wiring]

modules/shared/proc-override-translations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $ oc create configmap all-translations \
5656
As shown in the following examples, we recommend that you use the same mount path for your `allTranslations.json` file and any other override files that you create, for example `/opt/app-root/src/translations`.
5757
====
5858
+
59-
.. For an Operator-installed {product-very-short} instance, update your `{product-custom-resource-type}` custom resource (CR). For more information about configuring a CR, see link:https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html/configuring_red_hat_developer_hub/provisioning-and-using-your-custom-configuration#using-the-operator-to-run-rhdh-with-your-custom-configuration[Using the {product} Operator to run {product-short} with your custom configuration].
59+
.. For an Operator-installed {product-very-short} instance, update your `{product-custom-resource-type}` custom resource (CR). For more information about configuring a CR, see link:https://docs.redhat.com/en/documentation/red_hat_developer_hub/latest/html/configuring_red_hat_developer_hub/provisioning-and-using-your-custom-configuration#using-the-operator-to-run-rhdh-with-your-custom-configuration[Using the {product} Operator to run {product-short} with your custom configuration].
6060
... In the `spec.application.extraFiles` section, add the translations custom app configuration as shown in the following example:
6161
+
6262
.{product-custom-resource-type} custom resource fragment

0 commit comments

Comments
 (0)