Skip to content

Commit fa52eea

Browse files
authored
Merge pull request #62938 from aireilly/telcodocs-1434-ptp-events-configmap
Removing PV and PVC for PTP events docs
2 parents e69f557 + 0a21b73 commit fa52eea

7 files changed

+7
-173
lines changed

modules/cnf-about-ptp-fast-event-notifications-framework.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ The PTP plugin reads the event from the UNIX domain socket and passes it to the
3232

3333
image:darkcircle-3.png[20,20] Event is persisted::
3434
The `cloud-event-proxy` sidecar in the PTP Operator-managed pod processes the event and publishes the cloud-native event by using a REST API.
35-
+
36-
[NOTE]
37-
====
38-
When you use HTTP transport for events, you must persist the events subscription in the PTP Operator-managed pod by using a Persistent Volume (PV) resource or similar persistent storage mechanism.
39-
====
4035

4136
image:darkcircle-4.png[20,20] Message is transported::
4237
The message transporter transports the event to the `cloud-event-proxy` sidecar in the application pod over HTTP or AMQP 1.0 QPID.

modules/cnf-configuring-the-ptp-fast-event-publisher.adoc

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@ To start using PTP fast event notifications for a network interface in your clus
1616
1717
* You have installed the PTP Operator.
1818
19-
* When you use HTTP events transport, configure dynamic volume provisioning in the cluster or manually create `StorageClass`, `LocalVolume`, and `PersistentVolume` resources to persist the events subscription.
20-
+
21-
[NOTE]
22-
====
23-
When you enable dynamic volume provisioning in the cluster, a `PersistentVolume` resource is automatically created for the `PersistentVolumeClaim` that the PTP Operator deploys.
24-
25-
For more information about manually creating persistent storage in the cluster, see "Persistent storage using local volumes".
26-
====
27-
2819
.Procedure
2920

3021
. Modify the default PTP Operator config to enable PTP fast events.
@@ -43,19 +34,14 @@ spec:
4334
node-role.kubernetes.io/worker: ""
4435
ptpEventConfig:
4536
enableEventPublisher: true <1>
46-
storageType: "example-storage-class" <2>
4737
----
4838
<1> Set `enableEventPublisher` to `true` to enable PTP fast event notifications.
49-
<2> Use the value that you set for `storageType` to populate the `StorageClassName` field for the `PersistentVolumeClaim` (`PVC`) resource that the PTP Operator automatically deploys.
50-
The `PVC` resource is used to persist consumer event subscriptions.
39+
5140
+
5241
[NOTE]
5342
====
5443
In {product-title} 4.13 or later, you do not need to set the `spec.ptpEventConfig.transportHost` field in the `PtpOperatorConfig` resource when you use HTTP transport for PTP events.
5544
Set `transportHost` only when you use AMQP transport for PTP events.
56-
57-
The value that you set for `.spec.storageType` in the `PtpOperatorConfig` CR must match the `storageClassName` that is set in the `PersistentVolume` CR.
58-
If `storageType` is not set and the `transportHost` uses HTTP, the PTP daemons are not deployed.
5945
====
6046

6147
.. Update the `PtpOperatorConfig` CR:

modules/cnf-migrating-from-amqp-to-http-transport.adoc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ If you have previously deployed PTP or bare-metal events consumer applications,
1717
1818
* You have updated the PTP Operator or {redfish-operator} to version 4.13+ which uses HTTP transport by default.
1919
20-
* Configure dynamic volume provisioning in the cluster or manually create `StorageClass`, `LocalVolume`, and `PersistentVolume` resources to persist the events subscription.
21-
+
22-
[NOTE]
23-
====
24-
When dynamic volume provisioning is enabled, a `PersistentVolume` resource is automatically created for the `PersistentVolumeClaim` that the PTP Operator or {redfish-operator} deploys.
25-
====
26-
2720
.Procedure
2821

2922
. Update your events consumer application to use HTTP transport.

modules/nw-rfhe-creating-hardware-event.adoc

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,6 @@ To start using bare-metal events, create the `HardwareEvent` custom resource (CR
1818
1919
* You have created a `BMCEventSubscription` CR for the BMC Redfish hardware.
2020
21-
* You have configured dynamic volume provisioning in the cluster or you have manually created `StorageClass`, `LocalVolume`, and `PersistentVolume` CRs to persist the events subscription.
22-
+
23-
[NOTE]
24-
====
25-
When you enable dynamic volume provisioning in the cluster, a `PersistentVolume` resource is automatically created for the `PersistentVolumeClaim` that the {redfish-operator} deploys.
26-
27-
For more information about manually creating persistent storage in the cluster, see "Persistent storage using local volumes".
28-
====
29-
3021
.Procedure
3122

3223
. Create the `HardwareEvent` custom resource (CR):
@@ -47,25 +38,20 @@ metadata:
4738
spec:
4839
nodeSelector:
4940
node-role.kubernetes.io/hw-event: "" <1>
50-
storageType: "example-storage-class" <2>
51-
logLevel: "debug" <3>
52-
msgParserTimeout: "10" <4>
41+
logLevel: "debug" <2>
42+
msgParserTimeout: "10" <3>
5343
----
5444
+
5545
--
5646
<1> Required. Use the `nodeSelector` field to target nodes with the specified label, for example, `node-role.kubernetes.io/hw-event: ""`.
57-
<2> The value of `storageType` is used to populate the `StorageClassName` field for the `PersistentVolumeClaim` (`PVC`) resource that the {redfish-operator} automatically deploys.
58-
The `PVC` resource is used to persist consumer event subscriptions.
5947
+
6048
[NOTE]
6149
====
6250
In {product-title} 4.13 or later, you do not need to set the `spec.transportHost` field in the `HardwareEvent` resource when you use HTTP transport for bare-metal events.
6351
Set `transportHost` only when you use AMQP transport for bare-metal events.
64-
65-
The value that you set for `.spec.storageType` in the `HardwareEvent` CR must match the `storageClassName` that is set in the `PersistentVolume` CR.
6652
====
67-
<3> Optional. The default value is `debug`. Sets the log level in `hw-event-proxy` logs. The following log levels are available: `fatal`, `error`, `warning`, `info`, `debug`, `trace`.
68-
<4> Optional. Sets the timeout value in milliseconds for the Message Parser. If a message parsing request is not responded to within the timeout duration, the original hardware event message is passed to the cloud native event framework. The default value is 10.
53+
<2> Optional. The default value is `debug`. Sets the log level in `hw-event-proxy` logs. The following log levels are available: `fatal`, `error`, `warning`, `info`, `debug`, `trace`.
54+
<3> Optional. Sets the timeout value in milliseconds for the Message Parser. If a message parsing request is not responded to within the timeout duration, the original hardware event message is passed to the cloud native event framework. The default value is 10.
6955
--
7056

7157
.. Apply the `HardwareEvent` CR in the cluster:

modules/ztp-configuring-hwevents-using-pgt.adoc

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -39,85 +39,16 @@ You can configure bare-metal events that use HTTP transport on managed clusters
3939
policyName: "config-policy"
4040
spec:
4141
nodeSelector: {}
42-
storageType: <storage_class_name> <2>
4342
transportHost: "http://hw-event-publisher-service.openshift-bare-metal-events.svc.cluster.local:9043"
4443
logLevel: "info"
4544
----
4645
<1> Each baseboard management controller (BMC) requires a single `HardwareEvent` CR only.
47-
<2> The value that you set for `storageType` is used to populate the `StorageClassName` field for the `PersistentVolumeClaim` (`PVC`) CR that the {redfish-operator} Operator automatically deploys.
48-
The `PVC` CR is used to persist consumer event subscriptions.
4946
+
5047
[NOTE]
5148
====
5249
In {product-title} 4.13 or later, you do not need to set the `transportHost` field in the `HardwareEvent` custom resource (CR) when you use HTTP transport with bare-metal events.
5350
====
5451
55-
. Configure a `PersistentVolume` (`PV`) to persist the events subscription.
56-
+
57-
[NOTE]
58-
====
59-
A `PersistentVolume` (`PV`) CR for persisting events subscriptions is required only when you use HTTP transport for events.
60-
====
61-
+
62-
For example, add the following YAML to the `group-du-sno-ranGen.yaml` file:
63-
+
64-
[source,yaml]
65-
----
66-
- fileName: StorageLV.yaml <1>
67-
policyName: "config-policy"
68-
spec:
69-
storageClassDevices:
70-
- storageClassName: "storage-class-http-events" <2>
71-
volumeMode: Filesystem
72-
fsType: xfs
73-
devicePaths:
74-
- /dev/disk/by-partlabel/httpevent1
75-
- /dev/disk/by-partlabel/httpevent2
76-
- fileName: StoragePV.yaml <3>
77-
policyName: "config-policy"
78-
metadata:
79-
name: pv-storage-bmer
80-
spec:
81-
storageClassName: "storage-class-http-events" <4>
82-
capacity:
83-
storage: 10Mi
84-
----
85-
+
86-
--
87-
<1> Bare-metal events with HTTP transport requires local storage on the cluster node provided by the Local Storage Operator.
88-
<2> You need `storage-class-http-events` to use HTTP transport with the {redfish-operator}.
89-
Use the `ignitionConfigOverride` field in the related `SiteConfig` CR to manage the disk labels.
90-
<3> Storage for the `cloud-event-proxy` pubsubstore.
91-
+
92-
[NOTE]
93-
====
94-
You need the `StoragePV.yaml` YAML file that creates the `PV` CR only if the `PV` CR is not dynamically created by the Local Storage Operator.
95-
====
96-
<4> The `storageClassName` (`storage-class-http-events`) must match the name that is set in the `PVC` CR that the {redfish-operator} Operator deploys.
97-
--
98-
99-
. Configure a namespace and Operator group for the persistent storage this is used by the HTTP message transporter.
100-
For example, add the following YAML to `spec.sourceFiles` in `common-ranGen.yaml` file:
101-
+
102-
[source,yaml]
103-
----
104-
- fileName: StorageNS.yaml
105-
policyName: "storage-sub-policy"
106-
- fileName: StorageOperGroup.yaml
107-
policyName: "storage-sub-policy"
108-
- fileName: StorageOperatorStatus.yaml
109-
policyName: "storage-sub-policy"
110-
----
111-
112-
. Configure the individual site `SiteConfig` CR that you use to provision the managed cluster.
113-
For example, in `example-sno-site-1.yaml`, add the following YAML to the `spec.clusters.nodes` field:
114-
+
115-
[source,yaml]
116-
----
117-
ignitionConfigOverride:
118-
'{"ignition":{"version":"3.2.0"},"storage":{"disks":[{"device":"/dev/disk/by-id/wwn-0x11111000000asd123","wipeTable":false,"partitions":[{"sizeMiB":16,"label":"httpevent1","startMiB":350000},{"sizeMiB":16,"label":"httpevent2","startMiB":350016}]}],"filesystem":[{"device":"/dev/disk/by-partlabel/httpevent1","format":"xfs","wipeFilesystem":true},{"device":"/dev/disk/by-partlabel/httpevent2","format":"xfs","wipeFilesystem":true}]}}'
119-
----
120-
12152
. Merge any other required changes and files with your custom site repository.
12253

12354
. Push the changes to your site configuration repository to deploy bare-metal events to new sites with {ztp}.

modules/ztp-configuring-ptp-fast-events.adoc

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// * scalability_and_performance/ztp_far_edge/ztp-advanced-policy-config.adoc
44

5-
:_module-type: PROCEDURE
5+
:_content-type: PROCEDURE
66
[id="ztp-configuring-ptp-fast-events_{context}"]
77
= Configuring PTP events that use HTTP transport
88

@@ -30,11 +30,8 @@ You can configure PTP events that use HTTP transport on managed clusters that yo
3030
daemonNodeSelector: {}
3131
ptpEventConfig:
3232
enableEventPublisher: true
33-
storageType: "storage-class-http-events" <1>
3433
transportHost: http://ptp-event-publisher-service-NODE_NAME.openshift-ptp.svc.cluster.local:9043
3534
----
36-
<1> The value that you set for `storageType` is used to populate the `StorageClassName` field for the `PersistentVolumeClaim` (`PVC`) resource that the PTP Operator automatically deploys.
37-
The `PVC` resource is used to persist consumer event subscriptions.
3835
+
3936
[NOTE]
4037
====
@@ -66,58 +63,6 @@ In {product-title} 4.13 or later, you do not need to set the `transportHost` fie
6663
<4> Required `phc2sysOpts` values. `-m` prints messages to `stdout`. The `linuxptp-daemon` `DaemonSet` parses the logs and generates Prometheus metrics.
6764
<5> Optional. If the `ptpClockThreshold` stanza is not present, default values are used for the `ptpClockThreshold` fields. The stanza shows default `ptpClockThreshold` values. The `ptpClockThreshold` values configure how long after the PTP master clock is disconnected before PTP events are triggered. `holdOverTimeout` is the time value in seconds before the PTP clock event state changes to `FREERUN` when the PTP master clock is disconnected. The `maxOffsetThreshold` and `minOffsetThreshold` settings configure offset values in nanoseconds that compare against the values for `CLOCK_REALTIME` (`phc2sys`) or master offset (`ptp4l`). When the `ptp4l` or `phc2sys` offset value is outside this range, the PTP clock state is set to `FREERUN`. When the offset value is within this range, the PTP clock state is set to `LOCKED`.
6865

69-
. Configure a `LocalVolume` (`LV`) to persist the PTP events subscription on the host.
70-
+
71-
For example, add the following YAML to the `group-du-sno-ranGen.yaml` file:
72-
+
73-
[source,yaml]
74-
----
75-
- fileName: StorageLV.yaml <1>
76-
policyName: "config-policy"
77-
spec:
78-
storageClassDevices:
79-
- storageClassName: "storage-class-http-events" <2>
80-
volumeMode: Filesystem
81-
fsType: xfs
82-
devicePaths:
83-
- /dev/disk/by-partlabel/httpevent1
84-
- /dev/disk/by-partlabel/httpevent2
85-
- fileName: StoragePV.yaml <3>
86-
policyName: "config-policy"
87-
metadata:
88-
name: pv-storage-ptp
89-
spec:
90-
storageClassName: "storage-class-http-events" <4>
91-
----
92-
<1> PTP events with HTTP transport requires local storage on the cluster node provided by the Local Storage Operator.
93-
<2> Set `storageClassName` to `storage-class-http-events` to use HTTP transport with the PTP Operator.
94-
Use the `ignitionConfigOverride` field in the related `SiteConfig` CR to manage the disk labels.
95-
<3> Optional. Configure storage for the `cloud-event-proxy` pubsubstore.
96-
`StoragePV.yaml` is required only if the `PersistentVolume` (`PV`) CR is not dynamically created by the Local Storage Operator.
97-
<4> Set the value of `storageClassName` to match the name set in the `PVC` CR that the PTP Operator deploys.
98-
99-
. Configure a namespace and Operator group for the persistent storage this is used by the HTTP message transporter.
100-
For example, add the following YAML to `spec.sourceFiles` in `common-ranGen.yaml` file:
101-
+
102-
[source,yaml]
103-
----
104-
- fileName: StorageNS.yaml
105-
policyName: "storage-sub-policy"
106-
- fileName: StorageOperGroup.yaml
107-
policyName: "storage-sub-policy"
108-
- fileName: StorageOperatorStatus.yaml
109-
policyName: "storage-sub-policy"
110-
----
111-
112-
. Configure the individual site `SiteConfig` CR that you use to provision the managed cluster.
113-
For example, in `example-sno-site-1.yaml`, add the following YAML to the `spec.clusters.nodes` field:
114-
+
115-
[source,yaml]
116-
----
117-
ignitionConfigOverride:
118-
'{"ignition":{"version":"3.2.0"},"storage":{"disks":[{"device":"/dev/disk/by-id/wwn-0x11111000000asd123","wipeTable":false,"partitions":[{"sizeMiB":16,"label":"httpevent1","startMiB":350000},{"sizeMiB":16,"label":"httpevent2","startMiB":350016}]}],"filesystem":[{"device":"/dev/disk/by-partlabel/httpevent1","format":"xfs","wipeFilesystem":true},{"device":"/dev/disk/by-partlabel/httpevent2","format":"xfs","wipeFilesystem":true}]}}'
119-
----
120-
12166
. Merge any other required changes and files with your custom site repository.
12267

12368
. Push the changes to your site configuration repository to deploy PTP fast events to new sites using {ztp}.

networking/using-ptp.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ include::modules/cnf-configuring-the-ptp-fast-event-publisher.adoc[leveloffset=+
105105

106106
* For a complete example CR that configures `linuxptp` services as an ordinary clock with PTP fast events, see xref:../networking/using-ptp.adoc#configuring-linuxptp-services-as-ordinary-clock_using-ptp[Configuring linuxptp services as ordinary clock].
107107

108-
* For more information about manually configuring persistent storage in the cluster, see xref:../storage/persistent_storage/persistent_storage_local/persistent-storage-local.adoc#persistent-storage-using-local-volume[Persistent storage using local volumes].
109-
110108
include::modules/cnf-migrating-from-amqp-to-http-transport.adoc[leveloffset=+2]
111109

112110
include::modules/cnf-installing-amq-interconnect-messaging-bus.adoc[leveloffset=+2]
@@ -118,4 +116,4 @@ include::modules/cnf-monitoring-fast-events-metrics.adoc[leveloffset=+2]
118116
[role="_additional-resources"]
119117
.Additional resources
120118

121-
* xref:../monitoring/managing-metrics.adoc[Managing metrics]
119+
* xref:../monitoring/managing-metrics.adoc#managing-metrics[Managing metrics]

0 commit comments

Comments
 (0)