Skip to content

Commit 1c0be68

Browse files
authored
Merge branch 'main' into RHIDP-4362
2 parents 9f6e841 + 1b85c83 commit 1c0be68

File tree

40 files changed

+949
-357
lines changed

40 files changed

+949
-357
lines changed

artifacts/attributes.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
:rhel: Red Hat Enterprise Linux
1919
:odf-name: OpenShift Data Foundation
2020

21+
:my-product-url: https://__<my_developer_hub_url>__
22+
2123
// Red Hat Platforms
2224
:ocp-brand-name: Red Hat OpenShift Container Platform
2325
:ocp-short: OpenShift Container Platform
@@ -76,7 +78,6 @@
7678
:installing-and-viewing-dynamic-plugins-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_and_viewing_dynamic_plugins/index
7779
:installing-and-viewing-dynamic-plugins-title: Installing and viewing dynamic plugins
7880

79-
8081
:authentication-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/authentication/index
8182
:authentication-book-title: Authentication
8283

@@ -99,4 +100,4 @@
99100
:upgrading-book-title: Upgrading {product}
100101

101102
:plugins-configure-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html/configuring_dynamic_plugins/index
102-
:plugins-configure-book-title: Configuring dynamic plugins
103+
:plugins-configure-book-title: Configuring dynamic plugins

assemblies/assembly-add-custom-app-file-openshift.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
To access the {product}, you must add a custom application configuration file to {ocp-brand-name}. In {ocp-short}, you can use the following content as a base template to create a ConfigMap named `app-config-rhdh`:
55

6-
[source,yaml]
6+
[source,yaml,subs="attributes+"]
77
----
88
kind: ConfigMap
99
apiVersion: v1

assemblies/assembly-auth-provider-oidc.adoc

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[id="assembly-authenticating-with-microsoft-azure"]
2+
= Authentication with Microsoft Azure
3+
4+
To authenticate users with Microsoft Azure:
5+
6+
. xref:enabling-authentication-with-microsoft-azure[Enable authentication with Microsoft Azure].
7+
. xref:provisioning-users-from-microsoft-azure-to-the-software-catalog[Provision users from Microsoft Azure to the software catalog].
8+
9+
include::modules/authentication/proc-enabling-authentication-with-microsoft-azure.adoc[leveloffset=+1]
10+
11+
12+
include::modules/authentication/proc-provisioning-users-from-microsoft-azure-to-the-software-catalog.adoc[leveloffset=+1]
13+
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[id="assembly-authenticating-with-rhsso"]
2+
= Authenticating with Red Hat Single Sign-On (RHSSO)
3+
4+
To authenticate users with Red Hat Single Sign-On (RHSSO):
5+
6+
. xref:enabling-authentication-with-rhsso[Enable the OpenID Connect (OIDC) authentication provider in RHDH].
7+
. xref:provisioning-users-from-rhsso-to-the-software-catalog[Provision users from Red Hat Single-Sign On (RHSSO) to the software catalog].
8+
9+
include::modules/authentication/proc-enabling-authentication-with-rhsso.adoc[leveloffset=+1]
10+
11+
include::modules/authentication/proc-provisioning-users-from-rhsso-to-the-software-catalog.adoc[leveloffset=+1]
File renamed without changes.

assemblies/assembly-enabling-authentication.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ Therefore, deleting users and groups by using {product-short} Web UI or REST API
5050

5151

5252

53-
include::assembly-authenticationg-with-the-guest-user.adoc[leveloffset=+1]
53+
include::assembly-authenticating-with-the-guest-user.adoc[leveloffset=+1]
5454

5555

56-
include::modules/auth/proc-adding-azure-as-an-authentication-provider.adoc[leveloffset=+1]
56+
include::assembly-authenticating-with-rhsso.adoc[leveloffset=+1]
5757

5858

5959
include::assembly-auth-provider-github.adoc[leveloffset=+1]
6060

6161

62-
include::assembly-auth-provider-oidc.adoc[leveloffset=+1]
62+
include::assembly-authenticating-with-microsoft-azure.adoc[leveloffset=+1]
6363

assemblies/assembly-release-notes-breaking-changes.adoc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@
55
This section lists breaking changes in {product} {product-version}.
66

77

8-
include::modules/release-notes/snip-removed-functionality-rhidp-4293.adoc[leveloffset=+1]
8+
include::modules/release-notes/snip-removed-functionality-rhidp-3048.adoc[leveloffset=+1]
99

1010

11-
include::modules/release-notes/snip-removed-functionality-rhidp-3048.adoc[leveloffset=+1]
11+
include::modules/release-notes/snip-removed-functionality-rhidp-3074.adoc[leveloffset=+1]
1212

1313

1414
include::modules/release-notes/snip-removed-functionality-rhidp-3187.adoc[leveloffset=+1]
1515

16+
17+
include::modules/release-notes/snip-removed-functionality-rhidp-4293.adoc[leveloffset=+1]
18+
19+
20+

assemblies/assembly-release-notes-fixed-security-issues.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
This section lists security issues fixed in {product} {product-version}.
66

7+
== {product} {product-bundle-version}
78

8-
include::modules/release-notes/snip-common-vulnerabilities-and-exposures.adoc[leveloffset=+1]
9+
include::modules/release-notes/snip-fixed-security-issues-in-product-1.3.0.adoc[leveloffset=+2]
10+
11+
include::modules/release-notes/snip-fixed-security-issues-in-rpm-1.3.0.adoc[leveloffset=+2]
912

assemblies/assembly-release-notes-known-issues.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
This section lists known issues in {product} {product-version}.
66

77

8+
include::modules/release-notes/snip-known-issue-rhidp-4378.adoc[leveloffset=+1]
9+
10+
811
include::modules/release-notes/snip-known-issue-rhidp-4069.adoc[leveloffset=+1]
912

1013

0 commit comments

Comments
 (0)