Skip to content

Change default linuxPolicySetupTimeoutSeconds from 0 to 90 seconds #4118

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

Draft
Copilot wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Change default linuxPolicySetupTimeoutSeconds from 0 to 90 seconds #4118

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
7eaf6a7
Initial plan
Copilot Aug 28, 2025
8cd37d6
Change default linuxPolicySetupTimeoutSeconds from 0 to 90 seconds
Copilot Aug 28, 2025
ef15d24
Extend defaulting to support BPF and Nftables dataplanes and fix BPF …
Copilot Aug 28, 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: 1 addition & 1 deletion api/v1/installation_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ type CalicoNetworkSpec struct {
//
// * A value of 0 disables pod startup delays.
//
// Default: 0
// Default: 90
// +optional
LinuxPolicySetupTimeoutSeconds *int32 `json:"linuxPolicySetupTimeoutSeconds,omitempty"`
}
Expand Down
6 changes: 4 additions & 2 deletions pkg/controller/installation/core_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,11 @@ func fillDefaults(instance *operator.Installation, currentPools *crdv1.IPPoolLis
}

if instance.Spec.CNI.Type == operator.PluginCalico &&
*instance.Spec.CalicoNetwork.LinuxDataplane == operator.LinuxDataplaneIptables &&
(*instance.Spec.CalicoNetwork.LinuxDataplane == operator.LinuxDataplaneIptables ||
*instance.Spec.CalicoNetwork.LinuxDataplane == operator.LinuxDataplaneBPF ||
*instance.Spec.CalicoNetwork.LinuxDataplane == operator.LinuxDataplaneNftables) &&
instance.Spec.CalicoNetwork.LinuxPolicySetupTimeoutSeconds == nil {
var delay int32 = 0
var delay int32 = 90
instance.Spec.CalicoNetwork.LinuxPolicySetupTimeoutSeconds = &delay
}

Expand Down
10 changes: 6 additions & 4 deletions pkg/controller/installation/defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ var _ = Describe("Defaulting logic tests", func() {
Expect(instance.Spec.CalicoNetwork.WindowsDataplane).ToNot(BeNil())
Expect(*instance.Spec.CalicoNetwork.WindowsDataplane).To(Equal(operator.WindowsDataplaneDisabled))
Expect(*instance.Spec.CalicoNetwork.BGP).To(Equal(operator.BGPEnabled))
Expect(*instance.Spec.CalicoNetwork.LinuxPolicySetupTimeoutSeconds).To(BeZero())
Expect(*instance.Spec.CalicoNetwork.LinuxPolicySetupTimeoutSeconds).To(Equal(int32(90)))
Expect(*instance.Spec.ControlPlaneReplicas).To(Equal(int32(2)))
Expect(instance.Spec.NonPrivileged).NotTo(BeNil())
Expect(*instance.Spec.NonPrivileged).To(Equal(operator.NonPrivilegedDisabled))
Expand Down Expand Up @@ -98,7 +98,7 @@ var _ = Describe("Defaulting logic tests", func() {
Expect(instance.Spec.CalicoNetwork.WindowsDataplane).ToNot(BeNil())
Expect(*instance.Spec.CalicoNetwork.WindowsDataplane).To(Equal(operator.WindowsDataplaneDisabled))
Expect(*instance.Spec.CalicoNetwork.BGP).To(Equal(operator.BGPEnabled))
Expect(*instance.Spec.CalicoNetwork.LinuxPolicySetupTimeoutSeconds).To(BeZero())
Expect(*instance.Spec.CalicoNetwork.LinuxPolicySetupTimeoutSeconds).To(Equal(int32(90)))
Expect(*instance.Spec.ControlPlaneReplicas).To(Equal(int32(2)))
Expect(instance.Spec.NonPrivileged).NotTo(BeNil())
Expect(*instance.Spec.NonPrivileged).To(Equal(operator.NonPrivilegedDisabled))
Expand Down Expand Up @@ -209,6 +209,7 @@ var _ = Describe("Defaulting logic tests", func() {
var nodeMetricsPort int32 = 9081
false_ := false
var twentySeven int32 = 27
var linuxPolicySetupTimeoutSeconds int32 = 123 // Custom value to test that it's not overridden
var one intstr.IntOrString = intstr.FromInt(1)
var replicas int32 = 3
var logFileMaxCount uint32 = 5
Expand Down Expand Up @@ -244,8 +245,9 @@ var _ = Describe("Defaulting logic tests", func() {
ConfDir: &cniConfDir,
},
CalicoNetwork: &operator.CalicoNetworkSpec{
LinuxDataplane: &dpBPF, // Actually the default but BPF would make other values invalid.
WindowsDataplane: &winDataplaneDisabled,
LinuxDataplane: &dpBPF, // Actually the default but BPF would make other values invalid.
WindowsDataplane: &winDataplaneDisabled,
LinuxPolicySetupTimeoutSeconds: &linuxPolicySetupTimeoutSeconds,
IPPools: []operator.IPPool{
{
CIDR: "1.2.3.0/24",
Expand Down