Skip to content

Commit 4042858

Browse files
committed
TELCODOCS:604 - Updated variables and fixed variables throughout osc docs. Updated must-gather and kataMonitor images.
1 parent 03c0a6b commit 4042858

6 files changed

+18
-16
lines changed

_attributes/common-attributes.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ endif::openshift-origin[]
4545
:rh-rhacm: RHACM
4646
:sandboxed-containers-first: OpenShift sandboxed containers
4747
:sandboxed-containers-operator: OpenShift sandboxed containers Operator
48-
:sandboxed-containers-version: 1.1
49-
:sandboxed-containers-legacy-version: 1.0.2
48+
:sandboxed-containers-version: 1.3
49+
:sandboxed-containers-version-z: 1.3.0
50+
:sandboxed-containers-legacy-version: 1.2.2
5051
:cert-manager-operator: cert-manager Operator for Red Hat OpenShift
5152
:secondary-scheduler-operator-full: Secondary Scheduler Operator for Red Hat OpenShift
5253
:secondary-scheduler-operator: Secondary Scheduler Operator

modules/gathering-data-specific-features.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ ifndef::openshift-dedicated[]
5757
|Data collection for Local Storage Operator.
5858
endif::openshift-dedicated[]
5959

60-
|`registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel8:1.2.0`
60+
|`registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel8:{sandboxed-containers-version}.0`
6161
|Data collection for {sandboxed-containers-first}.
6262

6363
|`registry.redhat.io/workload-availability/self-node-remediation-must-gather-rhel8:v0.4.0`

modules/sandboxed-containers-create-kata-config-resource-cli.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,26 @@ Kata is installed on all worker nodes by default. If you want to install `kata`
2828

2929
. Create a YAML file with the following manifest:
3030
+
31-
[source,yaml]
31+
[source,yaml,subs="attributes+"]
3232
----
3333
apiVersion: kataconfiguration.openshift.io/v1
3434
kind: KataConfig
3535
metadata:
3636
name: cluster-kataconfig
3737
spec:
38-
kataMonitorImage: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel8:1.2.0
38+
kataMonitorImage: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel8:{sandboxed-containers-version}.0
3939
----
4040

4141
. (Optional) If you want to install `kata` as a `RuntimeClass` only on selected nodes, create a YAML file that includes the label in the manifest:
4242
+
43-
[source,yaml]
43+
[source,yaml,subs="attributes+"]
4444
----
4545
apiVersion: kataconfiguration.openshift.io/v1
4646
kind: KataConfig
4747
metadata:
4848
name: cluster-kataconfig
4949
spec:
50-
kataMonitorImage: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel8:1.2.0
50+
kataMonitorImage: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel8:{sandboxed-containers-version}.0
5151
kataConfigPoolSelector:
5252
matchLabels:
5353
<label_key>: '<label_value>'

modules/sandboxed-containers-create-kataconfig-resource-web-console.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ Kata is installed on all worker nodes by default. If you want to install `kata`
3232
. Copy and paste the following manifest into the *YAML view*:
3333

3434
+
35-
[source,yaml]
35+
[source,yaml,subs="attributes+"]
3636
----
3737
apiVersion: kataconfiguration.openshift.io/v1
3838
kind: KataConfig
3939
metadata:
4040
name: cluster-kataconfig
4141
spec:
42-
kataMonitorImage: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel8:1.2.0
42+
kataMonitorImage: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel8:{sandboxed-containers-version}.0
4343
----
4444
+
4545
If you want to install `kata` as a `RuntimeClass` only on selected nodes, include the label in the manifest:
4646

4747
+
48-
[source,yaml]
48+
[source,yaml,subs="attributes+"]
4949
----
5050
apiVersion: kataconfiguration.openshift.io/v1
5151
kind: KataConfig
5252
metadata:
5353
name: cluster-kataconfig
5454
spec:
55-
kataMonitorImage: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel8:1.2.0
55+
kataMonitorImage: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel8:{sandboxed-containers-version}.0
5656
kataConfigPoolSelector:
5757
matchLabels:
5858
<label_key>: '<label_value>'

modules/sandboxed-containers-installing-operator-cli.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ spec:
8181
name: sandboxed-containers-operator
8282
source: redhat-operators
8383
sourceNamespace: openshift-marketplace
84-
startingCSV: sandboxed-containers-operator.v1.2.0
84+
startingCSV: sandboxed-containers-operator.v{sandboxed-containers-version-z}
8585
----
8686

8787
.. Create the `Subscription` object:
@@ -109,7 +109,8 @@ $ oc get csv -n openshift-sandboxed-containers-operator
109109
+
110110
.Example output
111111
+
112+
[source,terminal,subs="attributes+"]
112113
----
113-
NAME DISPLAY VERSION REPLACES PHASE
114-
openshift-sandboxed-containers openshift-sandboxed-containers-operator {sandboxed-containers-version}.0 {sandboxed-containers-legacy-version} Succeeded
114+
NAME DISPLAY VERSION REPLACES PHASE
115+
openshift-sandboxed-containers openshift-sandboxed-containers-operator {sandboxed-containers-version-z} {sandboxed-containers-legacy-version} Succeeded
115116
----

sandboxed_containers/troubleshooting-sandboxed-containers.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ include::modules/about-must-gather.adoc[leveloffset=+2]
1717

1818
To collect {sandboxed-containers-first} data with `must-gather`, you must specify the
1919
{sandboxed-containers-first} image:
20-
[source,terminal]
20+
[source,terminal,subs="attributes+"]
2121
----
22-
--image=registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel8:1.2.0
22+
--image=registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel8:{sandboxed-containers-version}.0
2323
----
2424

2525
include::modules/sandboxed-containers-collecting-data.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)