Skip to content

OCPBUGS-66970: Ntpfailover backport 419 #645

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.

Sign up for GitHub

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

Merged
openshift-merge-bot merged 3 commits into from
Jan 7, 2026
Merged

OCPBUGS-66970: Ntpfailover backport 419 #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef80ae4
Add chronyd to process list
josephdrichard Jul 29, 2025
4e2f612
sort plugins to satisfy reconciler
josephdrichard Aug 26, 2025
bc25934
ntpfailover plugin enabled by default
josephdrichard Sep 8, 2025
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
2 changes: 2 additions & 0 deletions api/v1/ptpconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@ type PtpProfile struct {
Phc2sysOpts *string `json:"phc2sysOpts,omitempty"`
Ts2PhcOpts *string `json:"ts2phcOpts,omitempty"`
Synce4lOpts *string `json:"synce4lOpts,omitempty"`
ChronydOpts *string `json:"chronydOpts,omitempty"`
Ptp4lConf *string `json:"ptp4lConf,omitempty"`
Phc2sysConf *string `json:"phc2sysConf,omitempty"`
Ts2PhcConf *string `json:"ts2phcConf,omitempty"`
Synce4lConf *string `json:"synce4lConf,omitempty"`
ChronydConf *string `json:"chronydConf,omitempty"`
// +kubebuilder:validation:Enum=SCHED_OTHER;SCHED_FIFO;
PtpSchedulingPolicy *string `json:"ptpSchedulingPolicy,omitempty"`
// +kubebuilder:validation:Minimum=1
Expand Down
10 changes: 10 additions & 0 deletions api/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions bundle/manifests/ptp.openshift.io_ptpconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ spec:
profile:
items:
properties:
chronydConf:
type: string
chronydOpts:
type: string
interface:
type: string
name:
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/ptp.openshift.io_ptpconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ spec:
profile:
items:
properties:
chronydConf:
type: string
chronydOpts:
type: string
interface:
type: string
name:
Expand Down
5 changes: 3 additions & 2 deletions controllers/ptpoperatorconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"net/url"
"os"
"path/filepath"
"sort"
"strings"
"time"

Expand Down Expand Up @@ -246,9 +247,9 @@ func (r *PtpOperatorConfigReconciler) syncLinuxptpDaemon(ctx context.Context, de
pluginList = append(pluginList, k)
}
} else {
pluginList = []string{"e810"} // Enable e810 by default if plugins not specified
pluginList = []string{"e810", "ntpfailover"} // Enable e810 by default if plugins not specified
}

sort.Strings(pluginList)
enabledPlugins := strings.Join(pluginList, ",")
data.Data["EnabledPlugins"] = enabledPlugins
if enabledPlugins != "" {
Expand Down
4 changes: 4 additions & 0 deletions manifests/stable/ptp.openshift.io_ptpconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ spec:
profile:
items:
properties:
chronydConf:
type: string
chronydOpts:
type: string
interface:
type: string
name:
Expand Down