Skip to content

Commit 3fed7fb

Browse files
Merge pull request #397 from syedriko/syedriko-ols-1850
OLS-1850: OCP docs and Python deps update, week of 2025/06/16
2 parents 23d6f39 + 087e835 commit 3fed7fb

File tree

383 files changed

+14399
-11717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

383 files changed

+14399
-11717
lines changed

ocp-product-docs-plaintext/4.15/backup_and_restore/application_backup_and_restore/installing/installing-oadp-aws.txt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,18 @@ If you do not want to use the backup location credentials during the installatio
209209

210210
* Your object storage and cloud storage, if any, must use the same credentials.
211211
* You must configure object storage for Velero.
212-
* You must create a credentials-velero file for the object storage in the appropriate format.
213212

214-
* Create a Secret with the default name:
213+
1. Create a credentials-velero file for the backup storage location in the appropriate format for your cloud provider.
214+
215+
See the following example:
216+
217+
```terminal
218+
[default]
219+
aws_access_key_id=<AWS_ACCESS_KEY_ID>
220+
aws_secret_access_key=<AWS_SECRET_ACCESS_KEY>
221+
```
222+
223+
2. Create a Secret custom resource (CR) with the default name:
215224

216225
```terminal
217226
$ oc create secret generic cloud-credentials -n openshift-adp --from-file cloud=credentials-velero

ocp-product-docs-plaintext/4.15/backup_and_restore/application_backup_and_restore/installing/installing-oadp-azure.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,22 @@ If you do not want to use the backup location credentials during the installatio
8484

8585
* Your object storage and cloud storage, if any, must use the same credentials.
8686
* You must configure object storage for Velero.
87-
* You must create a credentials-velero file for the object storage in the appropriate format.
8887

89-
* Create a Secret with the default name:
88+
1. Create a credentials-velero file for the backup storage location in the appropriate format for your cloud provider.
89+
90+
See the following example:
91+
92+
```terminal
93+
AZURE_SUBSCRIPTION_ID= <azure_subscription_id>
94+
AZURE_TENANT_ID=<azure_tenant_id>
95+
AZURE_CLIENT_ID=<azure_client_id>
96+
AZURE_CLIENT_SECRET=<azure_client_secret>
97+
AZURE_STORAGE_ACCOUNT_ACCESS_KEY=<azure_storage_account_access_key>
98+
AZURE_RESOURCE_GROUP=<azure_resource_group>
99+
AZURE_CLOUD_NAME=<azure_cloud_name>
100+
```
101+
102+
2. Create a Secret custom resource (CR) with the default name:
90103

91104
```terminal
92105
$ oc create secret generic cloud-credentials-azure -n openshift-adp --from-file cloud=credentials-velero

ocp-product-docs-plaintext/4.15/backup_and_restore/application_backup_and_restore/installing/installing-oadp-gcp.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ If you do not want to use the backup location credentials during the installatio
170170

171171
* Your object storage and cloud storage, if any, must use the same credentials.
172172
* You must configure object storage for Velero.
173-
* You must create a credentials-velero file for the object storage in the appropriate format.
174173

175-
* Create a Secret with the default name:
174+
1. Create a credentials-velero file for the backup storage location in the appropriate format for your cloud provider.
175+
2. Create a Secret custom resource (CR) with the default name:
176176

177177
```terminal
178178
$ oc create secret generic cloud-credentials-gcp -n openshift-adp --from-file cloud=credentials-velero

ocp-product-docs-plaintext/4.15/backup_and_restore/application_backup_and_restore/installing/installing-oadp-ibm-cloud.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ If you do not want to use the backup location credentials during the installatio
139139

140140
* Your object storage and cloud storage, if any, must use the same credentials.
141141
* You must configure object storage for Velero.
142-
* You must create a credentials-velero file for the object storage in the appropriate format.
143142

144-
* Create a Secret with the default name:
143+
1. Create a credentials-velero file for the backup storage location in the appropriate format for your cloud provider.
144+
2. Create a Secret custom resource (CR) with the default name:
145145

146146
```terminal
147147
$ oc create secret generic cloud-credentials -n openshift-adp --from-file cloud=credentials-velero

ocp-product-docs-plaintext/4.15/backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.txt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,18 @@ If you do not want to use the backup location credentials during the installatio
9999

100100
* Your object storage and cloud storage, if any, must use the same credentials.
101101
* You must configure object storage for Velero.
102-
* You must create a credentials-velero file for the object storage in the appropriate format.
103102

104-
* Create a Secret with the default name:
103+
1. Create a credentials-velero file for the backup storage location in the appropriate format for your cloud provider.
104+
105+
See the following example:
106+
107+
```terminal
108+
[default]
109+
aws_access_key_id=<AWS_ACCESS_KEY_ID>
110+
aws_secret_access_key=<AWS_SECRET_ACCESS_KEY>
111+
```
112+
113+
2. Create a Secret custom resource (CR) with the default name:
105114

106115
```terminal
107116
$ oc create secret generic cloud-credentials -n openshift-adp --from-file cloud=credentials-velero

ocp-product-docs-plaintext/4.15/backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.txt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,18 @@ If you do not want to use the backup location credentials during the installatio
7474

7575
* Your object storage and cloud storage, if any, must use the same credentials.
7676
* You must configure object storage for Velero.
77-
* You must create a credentials-velero file for the object storage in the appropriate format.
7877

79-
* Create a Secret with the default name:
78+
1. Create a credentials-velero file for the backup storage location in the appropriate format for your cloud provider.
79+
80+
See the following example:
81+
82+
```terminal
83+
[default]
84+
aws_access_key_id=<AWS_ACCESS_KEY_ID>
85+
aws_secret_access_key=<AWS_SECRET_ACCESS_KEY>
86+
```
87+
88+
2. Create a Secret custom resource (CR) with the default name:
8089

8190
```terminal
8291
$ oc create secret generic cloud-credentials -n openshift-adp --from-file cloud=credentials-velero

ocp-product-docs-plaintext/4.15/backup_and_restore/application_backup_and_restore/oadp-3scale/backing-up-3scale-api-management-by-using-oadp.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ The value of the metadata.name parameter in the backup is the same value used in
387387
$ oc create -f redis-backup.yaml
388388
```
389389

390-
Example output:
390+
Example output
391391

392392
```terminal
393393
backup.velero.io/redis-backup created
@@ -400,7 +400,7 @@ backup.velero.io/redis-backup created
400400
$ oc get backups.velero.io redis-backup -o yaml
401401
```
402402

403-
Example output:
403+
Example output
404404

405405
```terminal
406406
status:

ocp-product-docs-plaintext/4.15/backup_and_restore/application_backup_and_restore/oadp-3scale/restoring-3scale-api-management-by-using-oadp.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ Do not delete the default PV and PVC associated with the database. If you do, yo
212212
$ oc scale deployment threescale-operator-controller-manager-v2 --replicas=0 -n threescale
213213
```
214214

215-
Example output:
215+
Example output
216216

217217
```terminal
218218
deployment.apps/threescale-operator-controller-manager-v2 scaled
@@ -238,7 +238,7 @@ done
238238
$ ./scaledowndeployment.sh
239239
```
240240

241-
Example output:
241+
Example output
242242

243243
```terminal
244244
deployment.apps.openshift.io/apicast-production scaled
@@ -264,7 +264,7 @@ deployment.apps.openshift.io/zync-que scaled
264264
$ oc delete deployment system-mysql -n threescale
265265
```
266266

267-
Example output:
267+
Example output
268268

269269
```terminal
270270
Warning: apps.openshift.io/v1 deployment is deprecated in v4.14+, unavailable in v4.10000+
@@ -335,7 +335,7 @@ restore.velerio.io/restore-mysql created
335335
$ oc get podvolumerestores.velero.io -n openshift-adp
336336
```
337337

338-
Example output:
338+
Example output
339339

340340
```terminal
341341
NAME NAMESPACE POD UPLOADER TYPE VOLUME STATUS TOTALBYTES BYTESDONE AGE
@@ -349,7 +349,7 @@ restore-mysql-z7x7l threescale system-mysql-2-kjkhl kopia exa
349349
$ oc get pvc -n threescale
350350
```
351351

352-
Example output:
352+
Example output
353353

354354
```terminal
355355
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS VOLUMEATTRIBUTESCLASS AGE
@@ -374,7 +374,7 @@ You can restore the back-end Redis database by deleting the deployment and speci
374374
$ oc delete deployment backend-redis -n threescale
375375
```
376376

377-
Example output:
377+
Example output
378378

379379
```terminal
380380
Warning: apps.openshift.io/v1 deployment is deprecated in v4.14+, unavailable in v4.10000+
@@ -489,7 +489,7 @@ done
489489
$ ./scaledeployment.sh
490490
```
491491

492-
Example output:
492+
Example output
493493

494494
```terminal
495495
deployment.apps.openshift.io/apicast-production scaled

ocp-product-docs-plaintext/4.15/backup_and_restore/application_backup_and_restore/oadp-use-cases/oadp-usecase-backup-using-odf.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Following is a use case for using OADP and ODF to back up an application.
77

88
In this use case, you back up an application by using OADP and store the backup in an object storage provided by Red Hat OpenShift Data Foundation (ODF).
99

10-
* You create a object bucket claim (OBC) to configure the backup storage location. You use ODF to configure an Amazon S3-compatible object storage bucket. ODF provides MultiCloud Object Gateway (NooBaa MCG) and Ceph Object Gateway, also known as RADOS Gateway (RGW), object storage service. In this use case, you use NooBaa MCG as the backup storage location.
10+
* You create an object bucket claim (OBC) to configure the backup storage location. You use ODF to configure an Amazon S3-compatible object storage bucket. ODF provides MultiCloud Object Gateway (NooBaa MCG) and Ceph Object Gateway, also known as RADOS Gateway (RGW), object storage service. In this use case, you use NooBaa MCG as the backup storage location.
1111
* You use the NooBaa MCG service with OADP by using the aws provider plugin.
1212
* You configure the Data Protection Application (DPA) with the backup storage location (BSL).
1313
* You create a backup custom resource (CR) and specify the application namespace to back up.

ocp-product-docs-plaintext/4.15/cicd/jenkins/important-changes-to-openshift-jenkins-images.txt

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ Red Hat OpenShift Container Platform 4.11 makes significant changes to the locat
1515
* If you upgrade from Red Hat OpenShift Container Platform 4.10 and earlier to 4.11, the deprecated maven and nodejs pod templates are still in the default image configuration.
1616
* If you upgrade from Red Hat OpenShift Container Platform 4.10 and earlier to 4.11, the jenkins-agent-maven and jenkins-agent-nodejs image streams still exist in your cluster. To maintain these image streams, see the following section, "What happens with the jenkins-agent-maven and jenkins-agent-nodejs image streams in the openshift namespace?"
1717

18-
Each new image in the ocp-tools-4 repository in the registry.redhat.io registry supports multiple versions of Red Hat OpenShift Container Platform. When Red Hat updates one of these new images, it is simultaneously available for all versions. This availability is ideal when Red Hat updates an image in response to a security advisory. Initially, this change applies to Red Hat OpenShift Container Platform 4.11 and later. It is planned that this change will eventually apply to Red Hat OpenShift Container Platform 4.9 and later.
18+
Each new image in the ocp-tools-4 repository in the registry.redhat.io registry supports multiple versions of Red Hat OpenShift Container Platform. When Red&#160;Hat updates one of these new images, it is simultaneously available for all versions. This availability is ideal when Red&#160;Hat updates an image in response to a security advisory. Initially, this change applies to Red Hat OpenShift Container Platform 4.11 and later. It is planned that this change will eventually apply to Red Hat OpenShift Container Platform 4.9 and later.
1919

20-
Previously, each Jenkins image supported only one version of Red Hat OpenShift Container Platform and Red Hat might update those images sequentially over time.
20+
Previously, each Jenkins image supported only one version of Red Hat OpenShift Container Platform and Red&#160;Hat might update those images sequentially over time.
2121

22-
By moving from an in-payload image stream to an image stream that references non-payload images, Red Hat OpenShift Container Platform can define additional image stream tags. Red Hat has created a series of new image stream tags to go along with the existing "value": "jenkins:2" and "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base-rhel8:latest" image stream tags present in Red Hat OpenShift Container Platform 4.10 and earlier. These new image stream tags address some requests to improve how the Jenkins-related image streams are maintained.
22+
By moving from an in-payload image stream to an image stream that references non-payload images, Red Hat OpenShift Container Platform can define additional image stream tags. Red&#160;Hat has created a series of new image stream tags to go along with the existing "value": "jenkins:2" and "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base-rhel8:latest" image stream tags present in Red Hat OpenShift Container Platform 4.10 and earlier. These new image stream tags address some requests to improve how the Jenkins-related image streams are maintained.
2323

2424
About the new image stream tags:
2525

@@ -43,6 +43,34 @@ $ oc import-image jenkins-agent-maven -n openshift
4343
```
4444

4545

46+
Jenkins supports the following architectures across Red Hat OpenShift Container Platform releases:
47+
48+
* amd64
49+
* arm64
50+
* ppc64le
51+
* s390x
52+
53+
However, for Red Hat OpenShift Container Platform Extended Update Support (EUS) releases, only the amd64 architecture is officially supported. As a result, OpenShift Jenkins images are shipped exclusively for amd64 on these releases. This is because the Red Hat OpenShift Container Platform platform itself supports only the amd64 architecture for EUS releases. For more information, see Support Matrix for OpenShift Jenkins releases.
54+
55+
Yes, Jenkins container images are updated on a quarterly basis, and the updates are made available for all supported Jenkins images across all supported Red Hat OpenShift Container Platform releases.
56+
57+
Red&#160;Hat supports only the latest Long-Term Support (LTS) version of the Jenkins core, as provided in our latest container images. We do not support multiple core versions. Our policy is to align with the latest Jenkins LTS version released by the upstream community.
58+
59+
Yes. Our goal is to maintain platform alignment. This means that Jenkins controller and agent images are built and tested for each supported Red Hat OpenShift Container Platform releases.
60+
61+
Jenkins is no longer part of the Red Hat OpenShift Container Platform core payload. Releases are managed separately. However, our intent is to publish updated OpenShift Jenkins images for newly released Red Hat OpenShift Container Platform releases within a few weeks of the Red Hat OpenShift Container Platform GA release.
62+
63+
Yes. We align with the Jenkins upstream lifecycle and follow the LTS version. Red&#160;Hat typically ships OpenShift Jenkins image updates quarterly unless a critical fix requires an out-of-cycle release.
64+
65+
To verify the current Jenkins LTS version:
66+
- Navigate to the Jenkins Catalog &#8594; Packages section
67+
- Search for “Jenkins”
68+
- The result will show two packages, one of which is the Jenkins LTS package.
69+
70+
* Jenkins versions older than the current OpenShift Jenkins LTS are not supported.
71+
* Running Jenkins outside of Red Hat OpenShift Container Platform is not supported.
72+
* Multiple core versions of Jenkins are not supported. Plugins bundled with our OpenShift Jenkins images follow the same versioning across all supported Red Hat OpenShift Container Platform releases.
73+
4674
# Customizing the Jenkins image stream tag
4775

4876
To override the default upgrade behavior and control how the Jenkins image is upgraded, you set the image stream tag value that your Jenkins deployment configurations use.

0 commit comments

Comments
 (0)