Skip to content

Commit a07f4f2

Browse files
committed
OSDOCS-3807: Ported the Trusted Certificate Authorities to OSD/ROSA
1 parent c0d0cca commit a07f4f2

File tree

4 files changed

+36
-2
lines changed

4 files changed

+36
-2
lines changed

_topic_maps/_topic_map_osd.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,17 @@ Topics:
160160
- Name: Upgrading OpenShift Dedicated
161161
File: osd-upgrades
162162
Distros: openshift-dedicated
163+
---
164+
Name: CI/CD
165+
Dir: cicd
166+
Topics:
167+
- Name: Builds
168+
Dir: builds
169+
Distros: openshift-dedicated
170+
Topics:
171+
- Name: Setting up additional trusted certificate authorities for builds
172+
File: setting-up-trusted-ca
173+
Distros: openshift-dedicated
163174
---
164175
Name: Add-on services
165176
Dir: adding_service_cluster

_topic_maps/_topic_map_rosa.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,17 @@ Topics:
261261
File: rosa-upgrading-sts
262262
- Name: Upgrading ROSA
263263
File: rosa-upgrading
264+
---
265+
Name: CI/CD
266+
Dir: cicd
267+
Topics:
268+
- Name: Builds
269+
Dir: builds
270+
Distros: openshift-rosa
271+
Topics:
272+
- Name: Setting up additional trusted certificate authorities for builds
273+
File: setting-up-trusted-ca
274+
Distros: openshift-rosa
264275
---
265276
Name: Add-on services
266277
Dir: adding_service_cluster

cicd/builds/setting-up-trusted-ca.adoc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
:_content-type: ASSEMBLY
22
[id="setting-up-trusted-ca"]
33
= Setting up additional trusted certificate authorities for builds
4+
ifndef::openshift-dedicated,openshift-rosa[]
45
include::_attributes/common-attributes.adoc[]
6+
endif::[]
7+
ifdef::openshift-dedicated,openshift-rosa[]
8+
include::_attributes/attributes-openshift-dedicated.adoc[]
9+
endif::[]
510
:context: setting-up-trusted-ca
611

712
toc::[]
813

9-
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
14+
ifdef::openshift-enterprise,openshift-rosa,openshift-dedicated,openshift-webscale,openshift-origin[]
1015
Use the following sections to set up additional certificate authorities (CA) to be trusted by builds when pulling images from an image registry.
1116

1217
The procedure requires a cluster administrator to create a `ConfigMap` and add additional CAs as keys in the `ConfigMap`.
@@ -24,5 +29,7 @@ include::modules/configmap-adding-ca.adoc[leveloffset=+1]
2429

2530
* link:https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#create-a-configmap[Create a `ConfigMap`]
2631
* link:https://kubectl.docs.kubernetes.io/guides/config_management/secrets_configmaps/[Secrets and `ConfigMaps`]
32+
ifndef::openshift-rosa,openshift-dedicated[]
2733
* xref:../../networking/configuring-a-custom-pki.adoc#configuring-a-custom-pki[Configuring a custom PKI]
2834
endif::[]
35+
endif::[]

modules/configmap-adding-ca.adoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@
66
[id="configmap-adding-ca_{context}"]
77
= Adding certificate authorities to the cluster
88

9-
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
9+
ifdef::openshift-enterprise,openshift-rosa,openshift-dedicated,openshift-webscale,openshift-origin[]
1010
You can add certificate authorities (CA) to the cluster for use when pushing and pulling images with the following procedure.
1111

1212
.Prerequisites
1313

14+
ifdef::openshift-rosa[]
1415
* You must have cluster administrator privileges.
16+
endif::[]
17+
ifdef::openshift-dedicated[]
18+
* You must have at least dedicated administrator privileges.
19+
endif::[]
1520
* You must have access to the public certificates of the registry, usually a `hostname/ca.crt` file located in the `/etc/docker/certs.d/` directory.
1621

1722
.Procedure

0 commit comments

Comments
 (0)