Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-4.17] OCPBUGS-49909: ztp: Set up ptpClockThreshold in source-crs and reference templates #2221

Open
wants to merge 1 commit into
base: release-4.17
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions ztp/kube-compare-reference/default_value.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,18 @@ optional_local_storage_operator_StorageSubscription:
source: redhat-operators-disconnected
optional_ptp_config_PtpConfigBoundary:
- spec:
profile:
- placeholder: true
recommend:
- match:
- nodeLabel: "node-role.kubernetes.io/$mcp"
optional_ptp_config_PtpConfigBoundaryForEvent:
- spec:
profile:
- ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- match:
- nodeLabel: "node-role.kubernetes.io/$mcp"
Expand All @@ -47,16 +54,27 @@ optional_ptp_config_PtpConfigDualCardGmWpc:
SMA2: 0 2
U.FL1: 0 1
U.FL2: 0 2
ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- match:
- nodeLabel: "node-role.kubernetes.io/$mcp"
optional_ptp_config_PtpConfigForHA:
- spec:
profile:
- placeholder: true
recommend:
- match:
- nodeLabel: "node-role.kubernetes.io/$mcp"
optional_ptp_config_PtpConfigForHAForEvent:
- spec:
profile:
- ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- match:
- nodeLabel: "node-role.kubernetes.io/$mcp"
Expand All @@ -71,6 +89,10 @@ optional_ptp_config_PtpConfigMasterForEvent:
- spec:
profile:
- interface: $interface
ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- match:
- nodeLabel: "node-role.kubernetes.io/$mcp"
Expand All @@ -92,13 +114,21 @@ optional_ptp_config_PtpConfigGmWpc:
SMA2: 0 2
U.FL1: 0 1
U.FL2: 0 2
ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- match:
- nodeLabel: "node-role.kubernetes.io/$mcp"
optional_ptp_config_PtpConfigSlaveForEvent:
- spec:
profile:
- interface: $interface
ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- match:
- nodeLabel: "node-role.kubernetes.io/$mcp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ metadata:
ran.openshift.io/ztp-deploy-wave: "10"
spec:
profile:
{{- range .spec.profile }}
- name: "boundary"
ptp4lOpts: "-2"
phc2sysOpts: "-a -r -n 24"
Expand Down Expand Up @@ -125,6 +126,11 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0xA0
{{- if .ptpClockThreshold }}
ptpClockThreshold:
{{- .ptpClockThreshold | toYaml | nindent 6 }}
{{- end }}
{{- end }}
recommend:
{{- range .spec.recommend }}
- profile: "boundary"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ metadata:
ran.openshift.io/ztp-deploy-wave: "10"
spec:
profile:
{{- range .spec.profile }}
- name: "boundary"
ptp4lOpts: "-2 --summary_interval -4"
phc2sysOpts: "-a -r -m -n 24 -N 8 -R 16"
Expand Down Expand Up @@ -125,6 +126,11 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0xA0
{{- if .ptpClockThreshold }}
ptpClockThreshold:
{{- .ptpClockThreshold | toYaml | nindent 6 }}
{{- end }}
{{- end }}
recommend:
{{- range .spec.recommend }}
- profile: "boundary"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,10 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0x20
{{- if .ptpClockThreshold }}
ptpClockThreshold:
{{- .ptpClockThreshold | toYaml | nindent 6 }}
{{- end }}
{{- end }}
recommend:
{{- range .spec.recommend }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ metadata:
ran.openshift.io/ztp-deploy-wave: "10"
spec:
profile:
{{- range .spec.profile }}
- name: "boundary-ha"
ptp4lOpts: ""
phc2sysOpts: "-a -r -n 24"
Expand All @@ -15,6 +16,11 @@ spec:
ptpSettings:
logReduce: "true"
haProfiles: "$profile1,$profile2"
{{- if .ptpClockThreshold }}
ptpClockThreshold:
{{- .ptpClockThreshold | toYaml | nindent 8 }}
{{- end }}
{{- end }}
recommend:
{{- range .spec.recommend }}
- profile: "boundary-ha"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ metadata:
ran.openshift.io/ztp-deploy-wave: "10"
spec:
profile:
{{- range .spec.profile }}
- name: "boundary-ha"
ptp4lOpts: ""
phc2sysOpts: "-a -r -m -n 24 -N 8 -R 16"
Expand All @@ -15,6 +16,11 @@ spec:
ptpSettings:
logReduce: "true"
haProfiles: "$profile1,$profile2"
{{- if .ptpClockThreshold }}
ptpClockThreshold:
{{- .ptpClockThreshold | toYaml | nindent 8 }}
{{- end }}
{{- end }}
recommend:
{{- range .spec.recommend }}
- profile: "boundary-ha"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0x20
{{- if .ptpClockThreshold }}
ptpClockThreshold:
{{- .ptpClockThreshold | toYaml | nindent 6 }}
{{- end }}
{{- end }}
recommend:
{{- range .spec.recommend }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0xA0
{{- if .ptpClockThreshold }}
ptpClockThreshold:
{{- .ptpClockThreshold | toYaml | nindent 6 }}
{{- end }}
{{- end }}
recommend:
{{- range .spec.recommend }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0xA0
{{- if .ptpClockThreshold }}
ptpClockThreshold:
{{- .ptpClockThreshold | toYaml | nindent 6 }}
{{- end }}
{{- end }}
recommend:
{{- range .spec.recommend }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0xA0
{{- if .ptpClockThreshold }}
ptpClockThreshold:
{{- .ptpClockThreshold | toYaml | nindent 6 }}
{{- end }}
{{- end }}
recommend:
{{- range .spec.recommend }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0xA0
{{- if .ptpClockThreshold }}
ptpClockThreshold:
{{- .ptpClockThreshold | toYaml | nindent 6 }}
{{- end }}
{{- end }}
recommend:
{{- range .spec.recommend }}
Expand Down
4 changes: 4 additions & 0 deletions ztp/source-crs/PtpConfigBoundaryForEvent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0xA0
ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- profile: "boundary"
priority: 4
Expand Down
4 changes: 4 additions & 0 deletions ztp/source-crs/PtpConfigDualCardGmWpc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,10 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0x20
ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- profile: "grandmaster"
priority: 4
Expand Down
4 changes: 4 additions & 0 deletions ztp/source-crs/PtpConfigForHAForEvent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ spec:
ptpSettings:
logReduce: "true"
haProfiles: "$profile1,$profile2"
ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- profile: "boundary-ha"
priority: 4
Expand Down
4 changes: 4 additions & 0 deletions ztp/source-crs/PtpConfigGmWpc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,10 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0x20
ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- profile: "grandmaster"
priority: 4
Expand Down
4 changes: 4 additions & 0 deletions ztp/source-crs/PtpConfigMasterForEvent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0xA0
ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- profile: "grandmaster"
priority: 4
Expand Down
4 changes: 4 additions & 0 deletions ztp/source-crs/PtpConfigSlaveForEvent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ spec:
manufacturerIdentity 00:00:00
userDescription ;
timeSource 0xA0
ptpClockThreshold:
holdOverTimeout: 5
maxOffsetThreshold: 100
minOffsetThreshold: -100
recommend:
- profile: "slave"
priority: 4
Expand Down