From f6445f6a2e862c69a33d08632e4dd6da2f072a3d Mon Sep 17 00:00:00 2001 From: Aidan Reilly <74046732+aireilly@users.noreply.github.com> Date: Tue, 17 Sep 2024 12:06:20 +0100 Subject: [PATCH] Redo 4.16 CRs with alpha sorting for easier future updates --- modules/telco-ran-crs-cluster-tuning.adoc | 2 +- modules/telco-ran-crs-day-2-operators.adoc | 24 +++--- .../telco-ran-yaml-ref-cluster-tuning.adoc | 14 ++-- .../telco-ran-yaml-ref-day-2-operators.adoc | 74 ++++++++----------- snippets/ztp_ImageBasedUpgrade.yaml | 2 +- snippets/ztp_LcaSubscriptionNS.yaml | 3 +- snippets/ztp_PtpConfigForHA.yaml | 2 +- snippets/ztp_StorageLVMSubscriptionNS.yaml | 1 + 8 files changed, 54 insertions(+), 68 deletions(-) diff --git a/modules/telco-ran-crs-cluster-tuning.adoc b/modules/telco-ran-crs-cluster-tuning.adoc index 7f881de8c9..819ae70b27 100644 --- a/modules/telco-ran-crs-cluster-tuning.adoc +++ b/modules/telco-ran-crs-cluster-tuning.adoc @@ -13,9 +13,9 @@ Component,Reference CR,Optional,New in this release Cluster capabilities,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-example-sno-yaml[example-sno.yaml],No,No Disabling network diagnostics,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-disablesnonetworkdiag-yaml[DisableSnoNetworkDiag.yaml],No,No Monitoring configuration,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-reducemonitoringfootprint-yaml[ReduceMonitoringFootprint.yaml],No,No +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 OperatorHub,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-defaultcatsrc-yaml[DefaultCatsrc.yaml],No,No OperatorHub,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-disableolmpprof-yaml[DisableOLMPprof.yaml],No,No OperatorHub,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-disconnectedicsp-yaml[DisconnectedICSP.yaml],No,No OperatorHub,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-operatorhub-yaml[OperatorHub.yaml],Yes,No -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 |==== diff --git a/modules/telco-ran-crs-day-2-operators.adoc b/modules/telco-ran-crs-day-2-operators.adoc index c1d2d1a822..ef944765e8 100644 --- a/modules/telco-ran-crs-day-2-operators.adoc +++ b/modules/telco-ran-crs-day-2-operators.adoc @@ -15,33 +15,31 @@ Cluster logging,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc# Cluster logging,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-clusterlogns-yaml[ClusterLogNS.yaml],No,No Cluster logging,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-clusterlogopergroup-yaml[ClusterLogOperGroup.yaml],No,No Cluster logging,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-clusterlogsubscription-yaml[ClusterLogSubscription.yaml],No,No +Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-imagebasedupgrade-yaml[ImageBasedUpgrade.yaml],Yes,Yes +Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscription-yaml[LcaSubscription.yaml],Yes,Yes +Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscriptionns-yaml[LcaSubscriptionNS.yaml],Yes,Yes +Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscriptionopergroup-yaml[LcaSubscriptionOperGroup.yaml],Yes,Yes Local Storage Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storageclass-yaml[StorageClass.yaml],Yes,No Local Storage Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelv-yaml[StorageLV.yaml],Yes,No Local Storage Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagens-yaml[StorageNS.yaml],Yes,No Local Storage Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storageopergroup-yaml[StorageOperGroup.yaml],Yes,No Local Storage Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagesubscription-yaml[StorageSubscription.yaml],Yes,No -Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-imagebasedupgrade-yaml[ImageBasedUpgrade.yaml],Yes,Yes -Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscription-yaml[LcaSubscription.yaml],Yes,Yes -Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscriptionns-yaml[LcaSubscriptionNS.yaml],Yes,Yes -Lifecycle Agent ,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lcasubscriptionopergroup-yaml[LcaSubscriptionOperGroup.yaml],Yes,Yes -{lvms},xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lvmoperatorstatus-yaml[LVMOperatorStatus.yaml],No,Yes -{lvms},xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmcluster-yaml[StorageLVMCluster.yaml],No,Yes -{lvms},xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscription-yaml[StorageLVMSubscription.yaml],No,Yes -{lvms},xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscriptionns-yaml[StorageLVMSubscriptionNS.yaml],No,Yes -{lvms},xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscriptionopergroup-yaml[StorageLVMSubscriptionOperGroup.yaml],No,Yes +LVM Storage,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-lvmoperatorstatus-yaml[LVMOperatorStatus.yaml],No,Yes +LVM Storage,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmcluster-yaml[StorageLVMCluster.yaml],No,Yes +LVM Storage,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscription-yaml[StorageLVMSubscription.yaml],No,Yes +LVM Storage,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscriptionns-yaml[StorageLVMSubscriptionNS.yaml],No,Yes +LVM Storage,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-storagelvmsubscriptionopergroup-yaml[StorageLVMSubscriptionOperGroup.yaml],No,Yes Node Tuning Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-performanceprofile-yaml[PerformanceProfile.yaml],No,No Node Tuning Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-tunedperformancepatch-yaml[TunedPerformancePatch.yaml],No,No PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigboundaryforevent-yaml[PtpConfigBoundaryForEvent.yaml],Yes,Yes -PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigdualcardgmwpc-yaml[PtpConfigDualCardGmWpc.yaml],Yes,Yes PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigforhaforevent-yaml[PtpConfigForHAForEvent.yaml],Yes,Yes -PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfiggmwpc-yaml[PtpConfigGmWpc.yaml],Yes,Yes PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigmasterforevent-yaml[PtpConfigMasterForEvent.yaml],Yes,Yes PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigslaveforevent-yaml[PtpConfigSlaveForEvent.yaml],Yes,Yes PTP fast event notifications,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpoperatorconfigforevent-yaml[PtpOperatorConfigForEvent.yaml],Yes,No PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigboundary-yaml[PtpConfigBoundary.yaml],No,No -PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigdualcardgmwpc-op-yaml[PtpConfigDualCardGmWpc.yaml],No,No +PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigdualcardgmwpc-yaml[PtpConfigDualCardGmWpc.yaml],No,No PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigforha-yaml[PtpConfigForHA.yaml],No,Yes -PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfiggmwpc-op-yaml[PtpConfigGmWpc.yaml],No,No +PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfiggmwpc-yaml[PtpConfigGmWpc.yaml],No,No PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpconfigslave-yaml[PtpConfigSlave.yaml],No,No PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpsubscription-yaml[PtpSubscription.yaml],No,No PTP Operator,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-ptpsubscriptionns-yaml[PtpSubscriptionNS.yaml],No,No diff --git a/modules/telco-ran-yaml-ref-cluster-tuning.adoc b/modules/telco-ran-yaml-ref-cluster-tuning.adoc index 08e2651b1d..5b1b8e8e6d 100644 --- a/modules/telco-ran-yaml-ref-cluster-tuning.adoc +++ b/modules/telco-ran-yaml-ref-cluster-tuning.adoc @@ -27,6 +27,13 @@ include::snippets/ztp_DisableSnoNetworkDiag.yaml[] include::snippets/ztp_ReduceMonitoringFootprint.yaml[] ---- +[id="ztp-09-openshift-marketplace-ns-yaml"] +.09-openshift-marketplace-ns.yaml +[source,yaml] +---- +include::snippets/ztp_09-openshift-marketplace-ns.yaml[] +---- + [id="ztp-defaultcatsrc-yaml"] .DefaultCatsrc.yaml [source,yaml] @@ -55,10 +62,3 @@ include::snippets/ztp_DisconnectedICSP.yaml[] include::snippets/ztp_OperatorHub.yaml[] ---- -[id="ztp-09-openshift-marketplace-ns-yaml"] -.09-openshift-marketplace-ns.yaml -[source,yaml] ----- -include::snippets/ztp_09-openshift-marketplace-ns.yaml[] ----- - diff --git a/modules/telco-ran-yaml-ref-day-2-operators.adoc b/modules/telco-ran-yaml-ref-day-2-operators.adoc index c075c3b93c..1dfa127394 100644 --- a/modules/telco-ran-yaml-ref-day-2-operators.adoc +++ b/modules/telco-ran-yaml-ref-day-2-operators.adoc @@ -41,6 +41,34 @@ include::snippets/ztp_ClusterLogOperGroup.yaml[] include::snippets/ztp_ClusterLogSubscription.yaml[] ---- +[id="ztp-imagebasedupgrade-yaml"] +.ImageBasedUpgrade.yaml +[source,yaml] +---- +include::snippets/ztp_ImageBasedUpgrade.yaml[] +---- + +[id="ztp-lcasubscription-yaml"] +.LcaSubscription.yaml +[source,yaml] +---- +include::snippets/ztp_LcaSubscription.yaml[] +---- + +[id="ztp-lcasubscriptionns-yaml"] +.LcaSubscriptionNS.yaml +[source,yaml] +---- +include::snippets/ztp_LcaSubscriptionNS.yaml[] +---- + +[id="ztp-lcasubscriptionopergroup-yaml"] +.LcaSubscriptionOperGroup.yaml +[source,yaml] +---- +include::snippets/ztp_LcaSubscriptionOperGroup.yaml[] +---- + [id="ztp-storageclass-yaml"] .StorageClass.yaml [source,yaml] @@ -76,34 +104,6 @@ include::snippets/ztp_StorageOperGroup.yaml[] include::snippets/ztp_StorageSubscription.yaml[] ---- -[id="ztp-imagebasedupgrade-yaml"] -.ImageBasedUpgrade.yaml -[source,yaml] ----- -include::snippets/ztp_ImageBasedUpgrade.yaml[] ----- - -[id="ztp-lcasubscription-yaml"] -.LcaSubscription.yaml -[source,yaml] ----- -include::snippets/ztp_LcaSubscription.yaml[] ----- - -[id="ztp-lcasubscriptionns-yaml"] -.LcaSubscriptionNS.yaml -[source,yaml] ----- -include::snippets/ztp_LcaSubscriptionNS.yaml[] ----- - -[id="ztp-lcasubscriptionopergroup-yaml"] -.LcaSubscriptionOperGroup.yaml -[source,yaml] ----- -include::snippets/ztp_LcaSubscriptionOperGroup.yaml[] ----- - [id="ztp-lvmoperatorstatus-yaml"] .LVMOperatorStatus.yaml [source,yaml] @@ -160,13 +160,6 @@ include::snippets/ztp_TunedPerformancePatch.yaml[] include::snippets/ztp_PtpConfigBoundaryForEvent.yaml[] ---- -[id="ztp-ptpconfigdualcardgmwpc-yaml"] -.PtpConfigDualCardGmWpc.yaml -[source,yaml] ----- -include::snippets/ztp_PtpConfigDualCardGmWpc.yaml[] ----- - [id="ztp-ptpconfigforhaforevent-yaml"] .PtpConfigForHAForEvent.yaml [source,yaml] @@ -174,13 +167,6 @@ include::snippets/ztp_PtpConfigDualCardGmWpc.yaml[] include::snippets/ztp_PtpConfigForHAForEvent.yaml[] ---- -[id="ztp-ptpconfiggmwpc-yaml"] -.PtpConfigGmWpc.yaml -[source,yaml] ----- -include::snippets/ztp_PtpConfigGmWpc.yaml[] ----- - [id="ztp-ptpconfigmasterforevent-yaml"] .PtpConfigMasterForEvent.yaml [source,yaml] @@ -209,7 +195,7 @@ include::snippets/ztp_PtpOperatorConfigForEvent.yaml[] include::snippets/ztp_PtpConfigBoundary.yaml[] ---- -[id="ztp-ptpconfigdualcardgmwpc-op-yaml"] +[id="ztp-ptpconfigdualcardgmwpc-yaml"] .PtpConfigDualCardGmWpc.yaml [source,yaml] ---- @@ -223,7 +209,7 @@ include::snippets/ztp_PtpConfigDualCardGmWpc.yaml[] include::snippets/ztp_PtpConfigForHA.yaml[] ---- -[id="ztp-ptpconfiggmwpc-op-yaml"] +[id="ztp-ptpconfiggmwpc-yaml"] .PtpConfigGmWpc.yaml [source,yaml] ---- diff --git a/snippets/ztp_ImageBasedUpgrade.yaml b/snippets/ztp_ImageBasedUpgrade.yaml index 53547c51dd..7e9ba453c6 100644 --- a/snippets/ztp_ImageBasedUpgrade.yaml +++ b/snippets/ztp_ImageBasedUpgrade.yaml @@ -1,4 +1,4 @@ -apiVersion: lca.openshift.io/v1alpha1 +apiVersion: lca.openshift.io/v1 kind: ImageBasedUpgrade metadata: name: upgrade diff --git a/snippets/ztp_LcaSubscriptionNS.yaml b/snippets/ztp_LcaSubscriptionNS.yaml index 33598fcccf..33bc3a6443 100644 --- a/snippets/ztp_LcaSubscriptionNS.yaml +++ b/snippets/ztp_LcaSubscriptionNS.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Namespace metadata: name: openshift-lifecycle-agent - annotations: {} + annotations: + workload.openshift.io/allowed: management labels: kubernetes.io/metadata.name: openshift-lifecycle-agent diff --git a/snippets/ztp_PtpConfigForHA.yaml b/snippets/ztp_PtpConfigForHA.yaml index 48ce9c7b9d..e72ae4ed1b 100644 --- a/snippets/ztp_PtpConfigForHA.yaml +++ b/snippets/ztp_PtpConfigForHA.yaml @@ -7,7 +7,7 @@ metadata: spec: profile: - name: "boundary-ha" - ptp4lOpts: "" # <1> + ptp4lOpts: "" phc2sysOpts: "-a -r -n 24" ptpSchedulingPolicy: SCHED_FIFO ptpSchedulingPriority: 10 diff --git a/snippets/ztp_StorageLVMSubscriptionNS.yaml b/snippets/ztp_StorageLVMSubscriptionNS.yaml index 97e84c011b..b34bb59008 100644 --- a/snippets/ztp_StorageLVMSubscriptionNS.yaml +++ b/snippets/ztp_StorageLVMSubscriptionNS.yaml @@ -3,5 +3,6 @@ kind: Namespace metadata: name: openshift-storage labels: + workload.openshift.io/allowed: "management" openshift.io/cluster-monitoring: "true" annotations: {}