Skip to content

Commit af913d6

Browse files
aireillyaireilly
authored
Merge pull request #81867 from aireilly/telco-rds-alpha-sort
TELCODOCS-1684 - Alpha-sort Core and RAN RDS for easier updates
2 parents 90249fd + 4dcfdcf commit af913d6

8 files changed

+53
-67
lines changed

‎modules/telco-ran-crs-cluster-tuning.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ Component,Reference CR,Optional,New in this release
1313
Cluster capabilities,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-example-sno-yaml[example-sno.yaml],No,No
1414
Disabling network diagnostics,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-disablesnonetworkdiag-yaml[DisableSnoNetworkDiag.yaml],No,No
1515
Monitoring configuration,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-reducemonitoringfootprint-yaml[ReduceMonitoringFootprint.yaml],No,No
16+
OperatorHub,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-09-openshift-marketplace-ns-yaml[09-openshift-marketplace-ns.yaml],No,No
1617
OperatorHub,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-defaultcatsrc-yaml[DefaultCatsrc.yaml],No,No
1718
OperatorHub,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-disableolmpprof-yaml[DisableOLMPprof.yaml],No,No
1819
OperatorHub,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-disconnectedicsp-yaml[DisconnectedICSP.yaml],No,No
1920
OperatorHub,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-operatorhub-yaml[OperatorHub.yaml],Yes,No
20-
OperatorHub,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-09-openshift-marketplace-ns-yaml[09-openshift-marketplace-ns.yaml],No,No
2121
|====

‎modules/telco-ran-crs-day-2-operators.adoc‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,31 @@ Cluster logging,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#
1515
Cluster logging,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-clusterlogns-yaml[ClusterLogNS.yaml],No,No
1616
Cluster logging,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-clusterlogopergroup-yaml[ClusterLogOperGroup.yaml],No,No
1717
Cluster logging,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-clusterlogsubscription-yaml[ClusterLogSubscription.yaml],No,No
18+
Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-imagebasedupgrade-yaml[ImageBasedUpgrade.yaml],Yes,Yes
19+
Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscription-yaml[LcaSubscription.yaml],Yes,Yes
20+
Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscriptionns-yaml[LcaSubscriptionNS.yaml],Yes,Yes
21+
Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscriptionopergroup-yaml[LcaSubscriptionOperGroup.yaml],Yes,Yes
1822
Local Storage Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storageclass-yaml[StorageClass.yaml],Yes,No
1923
Local Storage Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelv-yaml[StorageLV.yaml],Yes,No
2024
Local Storage Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagens-yaml[StorageNS.yaml],Yes,No
2125
Local Storage Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storageopergroup-yaml[StorageOperGroup.yaml],Yes,No
2226
Local Storage Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagesubscription-yaml[StorageSubscription.yaml],Yes,No
23-
Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-imagebasedupgrade-yaml[ImageBasedUpgrade.yaml],Yes,Yes
24-
Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscription-yaml[LcaSubscription.yaml],Yes,Yes
25-
Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscriptionns-yaml[LcaSubscriptionNS.yaml],Yes,Yes
26-
Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscriptionopergroup-yaml[LcaSubscriptionOperGroup.yaml],Yes,Yes
27-
{lvms},xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lvmoperatorstatus-yaml[LVMOperatorStatus.yaml],No,Yes
28-
{lvms},xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmcluster-yaml[StorageLVMCluster.yaml],No,Yes
29-
{lvms},xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscription-yaml[StorageLVMSubscription.yaml],No,Yes
30-
{lvms},xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscriptionns-yaml[StorageLVMSubscriptionNS.yaml],No,Yes
31-
{lvms},xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscriptionopergroup-yaml[StorageLVMSubscriptionOperGroup.yaml],No,Yes
27+
LVM Storage,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lvmoperatorstatus-yaml[LVMOperatorStatus.yaml],No,Yes
28+
LVM Storage,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmcluster-yaml[StorageLVMCluster.yaml],No,Yes
29+
LVM Storage,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscription-yaml[StorageLVMSubscription.yaml],No,Yes
30+
LVM Storage,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscriptionns-yaml[StorageLVMSubscriptionNS.yaml],No,Yes
31+
LVM Storage,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscriptionopergroup-yaml[StorageLVMSubscriptionOperGroup.yaml],No,Yes
3232
Node Tuning Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-performanceprofile-yaml[PerformanceProfile.yaml],No,No
3333
Node Tuning Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-tunedperformancepatch-yaml[TunedPerformancePatch.yaml],No,No
3434
PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigboundaryforevent-yaml[PtpConfigBoundaryForEvent.yaml],Yes,Yes
35-
PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigdualcardgmwpc-yaml[PtpConfigDualCardGmWpc.yaml],Yes,Yes
3635
PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigforhaforevent-yaml[PtpConfigForHAForEvent.yaml],Yes,Yes
37-
PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfiggmwpc-yaml[PtpConfigGmWpc.yaml],Yes,Yes
3836
PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigmasterforevent-yaml[PtpConfigMasterForEvent.yaml],Yes,Yes
3937
PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigslaveforevent-yaml[PtpConfigSlaveForEvent.yaml],Yes,Yes
4038
PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpoperatorconfigforevent-yaml[PtpOperatorConfigForEvent.yaml],Yes,No
4139
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigboundary-yaml[PtpConfigBoundary.yaml],No,No
42-
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigdualcardgmwpc-op-yaml[PtpConfigDualCardGmWpc.yaml],No,No
40+
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigdualcardgmwpc-yaml[PtpConfigDualCardGmWpc.yaml],No,No
4341
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigforha-yaml[PtpConfigForHA.yaml],No,Yes
44-
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfiggmwpc-op-yaml[PtpConfigGmWpc.yaml],No,No
42+
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfiggmwpc-yaml[PtpConfigGmWpc.yaml],No,No
4543
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigslave-yaml[PtpConfigSlave.yaml],No,No
4644
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpsubscription-yaml[PtpSubscription.yaml],No,No
4745
PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpsubscriptionns-yaml[PtpSubscriptionNS.yaml],No,No

‎modules/telco-ran-yaml-ref-cluster-tuning.adoc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ include::snippets/ztp_DisableSnoNetworkDiag.yaml[]
2727
include::snippets/ztp_ReduceMonitoringFootprint.yaml[]
2828
----
2929

30+
[id="ztp-09-openshift-marketplace-ns-yaml"]
31+
.09-openshift-marketplace-ns.yaml
32+
[source,yaml]
33+
----
34+
include::snippets/ztp_09-openshift-marketplace-ns.yaml[]
35+
----
36+
3037
[id="ztp-defaultcatsrc-yaml"]
3138
.DefaultCatsrc.yaml
3239
[source,yaml]
@@ -55,10 +62,3 @@ include::snippets/ztp_DisconnectedICSP.yaml[]
5562
include::snippets/ztp_OperatorHub.yaml[]
5663
----
5764

58-
[id="ztp-09-openshift-marketplace-ns-yaml"]
59-
.09-openshift-marketplace-ns.yaml
60-
[source,yaml]
61-
----
62-
include::snippets/ztp_09-openshift-marketplace-ns.yaml[]
63-
----
64-

‎modules/telco-ran-yaml-ref-day-2-operators.adoc‎

Lines changed: 29 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -41,67 +41,67 @@ include::snippets/ztp_ClusterLogOperGroup.yaml[]
4141
include::snippets/ztp_ClusterLogSubscription.yaml[]
4242
----
4343

44-
[id="ztp-storageclass-yaml"]
45-
.StorageClass.yaml
44+
[id="ztp-imagebasedupgrade-yaml"]
45+
.ImageBasedUpgrade.yaml
4646
[source,yaml]
4747
----
48-
include::snippets/ztp_StorageClass.yaml[]
48+
include::snippets/ztp_ImageBasedUpgrade.yaml[]
4949
----
5050

51-
[id="ztp-storagelv-yaml"]
52-
.StorageLV.yaml
51+
[id="ztp-lcasubscription-yaml"]
52+
.LcaSubscription.yaml
5353
[source,yaml]
5454
----
55-
include::snippets/ztp_StorageLV.yaml[]
55+
include::snippets/ztp_LcaSubscription.yaml[]
5656
----
5757

58-
[id="ztp-storagens-yaml"]
59-
.StorageNS.yaml
58+
[id="ztp-lcasubscriptionns-yaml"]
59+
.LcaSubscriptionNS.yaml
6060
[source,yaml]
6161
----
62-
include::snippets/ztp_StorageNS.yaml[]
62+
include::snippets/ztp_LcaSubscriptionNS.yaml[]
6363
----
6464

65-
[id="ztp-storageopergroup-yaml"]
66-
.StorageOperGroup.yaml
65+
[id="ztp-lcasubscriptionopergroup-yaml"]
66+
.LcaSubscriptionOperGroup.yaml
6767
[source,yaml]
6868
----
69-
include::snippets/ztp_StorageOperGroup.yaml[]
69+
include::snippets/ztp_LcaSubscriptionOperGroup.yaml[]
7070
----
7171

72-
[id="ztp-storagesubscription-yaml"]
73-
.StorageSubscription.yaml
72+
[id="ztp-storageclass-yaml"]
73+
.StorageClass.yaml
7474
[source,yaml]
7575
----
76-
include::snippets/ztp_StorageSubscription.yaml[]
76+
include::snippets/ztp_StorageClass.yaml[]
7777
----
7878

79-
[id="ztp-imagebasedupgrade-yaml"]
80-
.ImageBasedUpgrade.yaml
79+
[id="ztp-storagelv-yaml"]
80+
.StorageLV.yaml
8181
[source,yaml]
8282
----
83-
include::snippets/ztp_ImageBasedUpgrade.yaml[]
83+
include::snippets/ztp_StorageLV.yaml[]
8484
----
8585

86-
[id="ztp-lcasubscription-yaml"]
87-
.LcaSubscription.yaml
86+
[id="ztp-storagens-yaml"]
87+
.StorageNS.yaml
8888
[source,yaml]
8989
----
90-
include::snippets/ztp_LcaSubscription.yaml[]
90+
include::snippets/ztp_StorageNS.yaml[]
9191
----
9292

93-
[id="ztp-lcasubscriptionns-yaml"]
94-
.LcaSubscriptionNS.yaml
93+
[id="ztp-storageopergroup-yaml"]
94+
.StorageOperGroup.yaml
9595
[source,yaml]
9696
----
97-
include::snippets/ztp_LcaSubscriptionNS.yaml[]
97+
include::snippets/ztp_StorageOperGroup.yaml[]
9898
----
9999

100-
[id="ztp-lcasubscriptionopergroup-yaml"]
101-
.LcaSubscriptionOperGroup.yaml
100+
[id="ztp-storagesubscription-yaml"]
101+
.StorageSubscription.yaml
102102
[source,yaml]
103103
----
104-
include::snippets/ztp_LcaSubscriptionOperGroup.yaml[]
104+
include::snippets/ztp_StorageSubscription.yaml[]
105105
----
106106

107107
[id="ztp-lvmoperatorstatus-yaml"]
@@ -160,27 +160,13 @@ include::snippets/ztp_TunedPerformancePatch.yaml[]
160160
include::snippets/ztp_PtpConfigBoundaryForEvent.yaml[]
161161
----
162162

163-
[id="ztp-ptpconfigdualcardgmwpc-yaml"]
164-
.PtpConfigDualCardGmWpc.yaml
165-
[source,yaml]
166-
----
167-
include::snippets/ztp_PtpConfigDualCardGmWpc.yaml[]
168-
----
169-
170163
[id="ztp-ptpconfigforhaforevent-yaml"]
171164
.PtpConfigForHAForEvent.yaml
172165
[source,yaml]
173166
----
174167
include::snippets/ztp_PtpConfigForHAForEvent.yaml[]
175168
----
176169

177-
[id="ztp-ptpconfiggmwpc-yaml"]
178-
.PtpConfigGmWpc.yaml
179-
[source,yaml]
180-
----
181-
include::snippets/ztp_PtpConfigGmWpc.yaml[]
182-
----
183-
184170
[id="ztp-ptpconfigmasterforevent-yaml"]
185171
.PtpConfigMasterForEvent.yaml
186172
[source,yaml]
@@ -209,7 +195,7 @@ include::snippets/ztp_PtpOperatorConfigForEvent.yaml[]
209195
include::snippets/ztp_PtpConfigBoundary.yaml[]
210196
----
211197

212-
[id="ztp-ptpconfigdualcardgmwpc-op-yaml"]
198+
[id="ztp-ptpconfigdualcardgmwpc-yaml"]
213199
.PtpConfigDualCardGmWpc.yaml
214200
[source,yaml]
215201
----
@@ -223,7 +209,7 @@ include::snippets/ztp_PtpConfigDualCardGmWpc.yaml[]
223209
include::snippets/ztp_PtpConfigForHA.yaml[]
224210
----
225211

226-
[id="ztp-ptpconfiggmwpc-op-yaml"]
212+
[id="ztp-ptpconfiggmwpc-yaml"]
227213
.PtpConfigGmWpc.yaml
228214
[source,yaml]
229215
----

‎snippets/ztp_ImageBasedUpgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: lca.openshift.io/v1alpha1
1+
apiVersion: lca.openshift.io/v1
22
kind: ImageBasedUpgrade
33
metadata:
44
name: upgrade

‎snippets/ztp_LcaSubscriptionNS.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: v1
22
kind: Namespace
33
metadata:
44
name: openshift-lifecycle-agent
5-
annotations: {}
5+
annotations:
6+
workload.openshift.io/allowed: management
67
labels:
78
kubernetes.io/metadata.name: openshift-lifecycle-agent

‎snippets/ztp_PtpConfigForHA.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
spec:
88
profile:
99
- name: "boundary-ha"
10-
ptp4lOpts: "" # <1>
10+
ptp4lOpts: ""
1111
phc2sysOpts: "-a -r -n 24"
1212
ptpSchedulingPolicy: SCHED_FIFO
1313
ptpSchedulingPriority: 10

‎snippets/ztp_StorageLVMSubscriptionNS.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ kind: Namespace
33
metadata:
44
name: openshift-storage
55
labels:
6+
workload.openshift.io/allowed: "management"
67
openshift.io/cluster-monitoring: "true"
78
annotations: {}

0 commit comments

Comments
 (0)