-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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-v3.26] Auto pick #7550 #7821: remove node update calls in calico-node startup #7824
[release-v3.26] Auto pick #7550 #7821: remove node update calls in calico-node startup #7824
Conversation
Followup to projectcalico#7550 Change-Id: I01c8018c9d47401383f05861865ff0c9b44c506e
There is a nil pointer in the configureASNumber function if the networking backend is none (i.e. policy-only mode) Signed-off-by: Tobias Giese <[email protected]>
/sem-approve |
/retest |
This test is failing:
Which sounds like it might be a legitimate failure based on these changes |
Okay, I‘ll check tomorrow if we need further cherry-picks (and will also test it locally) |
We have to cherry-pick Are all three cherry-picks in this single PR okay or should I open three separate PRs? |
@caseydavenport funny is that even on diff --git a/node/pkg/lifecycle/startup/startup_test.go b/node/pkg/lifecycle/startup/startup_test.go
index f52c80731..bcf3b8738 100644
--- a/node/pkg/lifecycle/startup/startup_test.go
+++ b/node/pkg/lifecycle/startup/startup_test.go
@@ -123,7 +123,7 @@ var _ = DescribeTable("Node IP detection failure cases",
Entry("startup should terminate if IP is set to none and Calico is used for networking", "bird", 1, "", false),
Entry("startup should NOT terminate if IP is set to none and Calico is policy-only", "none", 0, "", false),
- Entry("startup should NOT terminate and BGPSpec shouldn't be set to nil", "none", 0, "rrClusterID", true),
+ Entry("startup should NOT terminate and BGPSpec shouldn't be set to nil", "none", 0, "rrClusterID", false),
)
var _ = Describe("Default IPv4 pool CIDR", func() { This change should fix it -- or even without any condition if and update is expected. Am I correct? Edit: created PR #7829 |
The test PR has been merged - this probably just needs a rebase? |
Had no time, will do it |
Policy only mode will no longer update the BGP spec. Thus, the unit test should be fixed as well. Signed-off-by: Tobias Giese <[email protected]>
Removing "merge-when-ready" label due to new commits |
/sem-approve |
Description
Cherry pick of #7714 and #7821 on release-v3.26.
Fixes #7819
Related issues/PRs
Release Note
Reminder for the reviewer
Make sure that this PR has the correct labels and milestone set.
Every PR needs one
docs-*
label.docs-pr-required
: This change requires a change to the documentation that has not been completed yet.docs-completed
: This change has all necessary documentation completed.docs-not-required
: This change has no user-facing impact and requires no docs.Every PR needs one
release-note-*
label.release-note-required
: This PR has user-facing changes. Most PRs should have this label.release-note-not-required
: This PR has no user-facing changes.Other optional labels:
cherry-pick-candidate
: This PR should be cherry-picked to an earlier release. For bug fixes only.needs-operator-pr
: This PR is related to install and requires a corresponding change to the operator.