Skip to content

Commit 746d9cd

Browse files
authored
Merge pull request #47282 from ahardin-rh/4-11-version-bumps
OSDOCS-3548: update version number references and package names for 4.11
2 parents 21f7337 + f22d52b commit 746d9cd

File tree

52 files changed

+122
-124
lines changed

Some content is hidden

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

52 files changed

+122
-124
lines changed

applications/connecting_applications_to_services/sbo-release-notes.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//OpenShift Service Binding Release Notes
22
:_content-type: ASSEMBLY
33
[id="servicebinding-release-notes"]
4-
= Release notes for {servicebinding-title}
4+
= Release notes for {servicebinding-title}
55
:context: servicebinding-release-notes
66
include::_attributes/common-attributes.adoc[]
77
include::_attributes/servicebinding-document-attributes.adoc[]
@@ -67,4 +67,4 @@ include::modules/sbo-release-notes-1-0.adoc[leveloffset=+1]
6767
[role="_additional-resources"]
6868
[id="additional-resources_release-notes-sbo"]
6969
== Additional resources
70-
* xref:../../applications/connecting_applications_to_services/understanding-service-binding-operator.adoc#understanding-service-binding-operator[Understanding Service Binding Operator].
70+
* xref:../../applications/connecting_applications_to_services/understanding-service-binding-operator.adoc#understanding-service-binding-operator[Understanding Service Binding Operator].

modules/about-must-gather.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ For example:
2727
+
2828
[source,terminal]
2929
----
30-
$ oc adm must-gather --image=registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel8:v4.10.0
30+
$ oc adm must-gather --image=registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel8:v4.11.0
3131
----
3232
3333
* To collect the audit logs, use the `-- /usr/bin/gather_audit_logs` argument, as described in a following section.

modules/architecture-machine-roles.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ The cluster also contains the definition for the bootstrap role. Because the boo
1313

1414
== Control plane and node host compatibility
1515

16-
The {product-title} version must match between control plane host and node host. For example, in a 4.10 cluster, all control plane hosts must be 4.10 and all nodes must be 4.10.
16+
The {product-title} version must match between control plane host and node host. For example, in a 4.11 cluster, all control plane hosts must be 4.11 and all nodes must be 4.11.
1717

18-
Temporary mismatches during cluster upgrades are acceptable. For example, when upgrading from {product-title} 4.9 to 4.10, some nodes will upgrade to 4.10 before others. Prolonged skewing of control plane hosts and node hosts might expose older compute machines to bugs and missing features. Users should resolve skewed control plane hosts and node hosts as soon as possible.
18+
Temporary mismatches during cluster upgrades are acceptable. For example, when upgrading from {product-title} 4.10 to 4.11, some nodes will upgrade to 4.11 before others. Prolonged skewing of control plane hosts and node hosts might expose older compute machines to bugs and missing features. Users should resolve skewed control plane hosts and node hosts as soon as possible.
1919

2020
The `kubelet` service must not be newer than `kube-apiserver`, and can be up to two minor versions older depending on whether your {product-title} version is odd or even. The table below shows the appropriate version compatibility:
2121

@@ -33,7 +33,7 @@ The `kubelet` service must not be newer than `kube-apiserver`, and can be up to
3333
|===
3434
[.small]
3535
--
36-
1. For example, {product-title} 4.5, 4.7, 4.9.
36+
1. For example, {product-title} 4.5, 4.7, 4.9, 4.11.
3737
2. For example, {product-title} 4.6, 4.8, 4.10.
3838
--
3939

modules/cli-installing-cli-rpm.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ For {op-system-base-full}, you can install the OpenShift CLI (`oc`) as an RPM if
4848
+
4949
[source,terminal]
5050
----
51-
# subscription-manager repos --enable="rhocp-4.10-for-rhel-8-x86_64-rpms"
51+
# subscription-manager repos --enable="rhocp-4.11-for-rhel-8-x86_64-rpms"
5252
----
5353

5454
** For Red Hat Enterprise Linux 7:
5555
+
5656
[source,terminal]
5757
----
58-
# subscription-manager repos --enable="rhel-7-server-ose-4.10-rpms"
58+
# subscription-manager repos --enable="rhel-7-server-ose-4.11-rpms"
5959
----
6060

6161
. Install the `openshift-clients` package:

modules/cluster-logging-loki-tech-preview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You can use the {product-title} web console to install the LokiOperator.
2020

2121
.Prerequisites
2222

23-
* {product-title}: 4.10
23+
* {product-title}: 4.11
2424
* {logging-title-uc}: 5.4
2525

2626
To install the LokiOperator using the {product-title} web console:

modules/cluster-logging-vector-tech-preview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Vector does not support FIPS Enabled Clusters.
3030

3131
.Prerequisites
3232

33-
* {product-title}: 4.10
33+
* {product-title}: 4.11
3434
* {logging-title-uc}: 5.4
3535
* FIPS disabled
3636

modules/cnf-configure_for_irq_dynamic_load_balancing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ metadata:
4444
spec:
4545
containers:
4646
- name: dynamic-irq-pod
47-
image: "registry.redhat.io/openshift4/cnf-tests-rhel8:v4.10"
47+
image: "registry.redhat.io/openshift4/cnf-tests-rhel8:v4.11"
4848
command: ["sleep", "10h"]
4949
resources:
5050
requests:

modules/cnf-installing-the-performance-addon-operator.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ $ oc get packagemanifest performance-addon-operator -n openshift-marketplace -o
7676
.Example output
7777
[source,terminal]
7878
----
79-
4.10
79+
4.11
8080
----
8181

8282
.. Create the following Subscription CR and save the YAML in the `pao-sub.yaml` file:

modules/cnf-upgrading-performance-addon-operator.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You can manually upgrade Performance Addon Operator to the next minor version by
4545

4646
. In the *Update channel* pane, click the pencil icon on the right side of the version number to open the *Change Subscription update channel* window.
4747

48-
. Select the next minor version. For example, if you want to upgrade to Performance Addon Operator 4.10, select *4.10*.
48+
. Select the next minor version. For example, if you want to upgrade to Performance Addon Operator 4.11, select *4.11*.
4949

5050
. Click *Save*.
5151

@@ -116,8 +116,8 @@ $ oc get csv
116116
[source,terminal]
117117
----
118118
VERSION REPLACES PHASE
119-
4.10.0 performance-addon-operator.v4.10.0 Installing
120-
4.8.0 Replacing
119+
4.11.0 performance-addon-operator.v4.11.0 Installing
120+
4.10.0 Replacing
121121
----
122122

123123
. Run `get csv` again to verify the output:
@@ -130,6 +130,6 @@ VERSION REPLACES PHASE
130130
.Example output
131131
[source,terminal]
132132
----
133-
NAME DISPLAY VERSION REPLACES PHASE
134-
performance-addon-operator.v4.10.0 Performance Addon Operator 4.10.0 performance-addon-operator.v4.8.0 Succeeded
133+
NAME DISPLAY VERSION REPLACES PHASE
134+
performance-addon-operator.v4.11.0 Performance Addon Operator 4.11.0 performance-addon-operator.v4.10.0 Succeeded
135135
----

modules/containers-signature-verify-enable.adoc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ $ oc get mc
8989
----
9090
+
9191
.Sample output
92-
[source,terminal]
92+
[source,terminal]
9393
----
9494
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
9595
00-master a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m
@@ -106,13 +106,13 @@ NAME GENERATEDBYCONTROLLER
106106
99-worker-generated-crio-seccomp-use-default 3.2.0 25m
107107
99-worker-generated-registries a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m
108108
99-worker-ssh 3.2.0 28m
109-
rendered-master-af1e7ff78da0a9c851bab4be2777773b a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 8s
109+
rendered-master-af1e7ff78da0a9c851bab4be2777773b a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 8s
110110
rendered-master-cd51fd0c47e91812bfef2765c52ec7e6 a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 24m
111111
rendered-worker-2b52f75684fbc711bd1652dd86fd0b82 a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 24m
112112
rendered-worker-be3b3bce4f4aa52a62902304bac9da3c a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 48s <2>
113113
----
114114
<1> New machine config
115-
<2> New rendered machine config
115+
<2> New rendered machine config
116116

117117
.. Check that the worker machine config pool is updating with the new machine config:
118118
+
@@ -122,7 +122,7 @@ $ oc get mcp
122122
----
123123
+
124124
.Sample output
125-
[source,terminal]
125+
[source,terminal]
126126
----
127127
NAME CONFIG UPDATED UPDATING DEGRADED MACHINECOUNT READYMACHINECOUNT UPDATEDMACHINECOUNT DEGRADEDMACHINECOUNT AGE
128128
master rendered-master-af1e7ff78da0a9c851bab4be2777773b True False False 3 3 3 0 30m
@@ -146,7 +146,7 @@ $ oc debug node/<node_name>
146146
sh-4.2# chroot /host
147147
----
148148

149-
.. Create a `/etc/containers/registries.d/registry.redhat.io.yaml` file that contains the following:
149+
.. Create a `/etc/containers/registries.d/registry.redhat.io.yaml` file that contains the following:
150150
+
151151
[source,terminal]
152152
----
@@ -155,7 +155,7 @@ docker:
155155
sigstore: https://registry.redhat.io/containers/sigstore
156156
----
157157

158-
.. Create a `/etc/containers/registries.d/registry.access.redhat.com.yaml` file that contains the following:
158+
.. Create a `/etc/containers/registries.d/registry.access.redhat.com.yaml` file that contains the following:
159159
+
160160
[source,terminal]
161161
----
@@ -165,4 +165,3 @@ docker:
165165
----
166166

167167
.. Exit the debug session.
168-

0 commit comments

Comments
 (0)