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.

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

Jump to bottom

[release-v3.26] Auto pick #7550 #7821: remove node update calls in calico-node startup #7824

Merged
merged 3 commits into from
Jul 25, 2023
Merged

[release-v3.26] Auto pick #7550 #7821: remove node update calls in calico-node startup #7824

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e08c9c6
Remove remaining node update calls in calico-node startup
skmatti May 27, 2023
057d956
Fix nilpointer if CALICO_NETWORKING_BACKEND=none
tobiasgiese Jun 28, 2023
da3602f
Fix startup unit test for policy only mode
tobiasgiese Jul 1, 2023
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
6 changes: 4 additions & 2 deletions node/filesystem/etc/rc.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ if [ -z "$CALICO_DISABLE_FELIX" ]; then
cp -a /etc/service/available/felix /etc/service/enabled/
fi

# Monitor change in node IP addresses and subnets.
cp -a /etc/service/available/monitor-addresses /etc/service/enabled/
if [ "$CALICO_NETWORKING_BACKEND" != "none" ]; then
# Monitor change in node IP addresses and subnets.
cp -a /etc/service/available/monitor-addresses /etc/service/enabled/
fi

# Enable the allocate tunnel IP service
cp -a /etc/service/available/allocate-tunnel-addrs /etc/service/enabled/
Expand Down
52 changes: 29 additions & 23 deletions node/pkg/lifecycle/startup/startup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,25 +182,22 @@ func Run() {
}
}

// If Calico is running in policy only mode we don't need to write BGP related details to the Node.
if os.Getenv("CALICO_NETWORKING_BACKEND") != "none" {
configureAndCheckIPAddressSubnets(ctx, cli, node, k8sNode)
// Configure the node AS number.
configureASNumber(node)
}

needsNodeUpdate := configureAndCheckIPAddressSubnets(ctx, cli, node, k8sNode)
// Configure the node AS number.
needsNodeUpdate = configureASNumber(node) || needsNodeUpdate
// Populate a reference to the node based on orchestrator node identifiers.
configureNodeRef(node)
needsNodeUpdate = configureNodeRef(node) || needsNodeUpdate
if needsNodeUpdate {
// Apply the updated node resource.
if _, err := CreateOrUpdate(ctx, cli, node); err != nil {
log.WithError(err).Errorf("Unable to set node resource configuration")
utils.Terminate()
}
}

// Check expected filesystem
ensureFilesystemAsExpected()

// Apply the updated node resource.
if _, err := CreateOrUpdate(ctx, cli, node); err != nil {
log.WithError(err).Errorf("Unable to set node resource configuration")
utils.Terminate()
}

// Configure IP Pool configuration.
configureIPPools(ctx, cli, kubeadmConfig)

Expand Down Expand Up @@ -257,6 +254,11 @@ func getMonitorPollInterval() time.Duration {
}

func configureAndCheckIPAddressSubnets(ctx context.Context, cli client.Interface, node *libapi.Node, k8sNode *v1.Node) bool {
// If Calico is running in policy only mode we don't need to write BGP related
// details to the Node.
if os.Getenv("CALICO_NETWORKING_BACKEND") == "none" {
return false
}
// Configure and verify the node IP addresses and subnets.
checkConflicts, err := configureIPsAndSubnets(node, k8sNode, func(incl []string, excl []string, version int) ([]autodetection.Interface, error) {
return autodetection.GetInterfaces(net.Interfaces, incl, excl, version)
Expand Down Expand Up @@ -309,12 +311,6 @@ func configureAndCheckIPAddressSubnets(ctx context.Context, cli client.Interface
}

func MonitorIPAddressSubnets() {
// If Calico is running in policy only mode we don't need to write BGP
// related details to the Node.
if os.Getenv("CALICO_NETWORKING_BACKEND") == "none" {
log.Info("Skipped monitoring node IP changes when CALICO_NETWORKING_BACKEND=none")
return
}
ctx := context.Background()
_, cli := calicoclient.CreateClient()
nodeName := utils.DetermineNodeName()
Expand Down Expand Up @@ -369,16 +365,18 @@ func MonitorIPAddressSubnets() {

// configureNodeRef will attempt to discover the cluster type it is running on, check to ensure we
// have not already set it on this Node, and set it if need be.
func configureNodeRef(node *libapi.Node) {
// Returns true if the node object needs to updated.
func configureNodeRef(node *libapi.Node) bool {
orchestrator := "k8s"
nodeRef := ""

// Sort out what type of cluster we're running on.
if nodeRef = os.Getenv("CALICO_K8S_NODE_REF"); nodeRef == "" {
return
return false
}

node.Spec.OrchRefs = []libapi.OrchRef{{NodeName: nodeRef, Orchestrator: orchestrator}}
return true
}

// CreateOrUpdate creates the Node if ResourceVersion is not specified,
Expand Down Expand Up @@ -690,7 +688,13 @@ func evaluateENVBool(envVar string, defaultValue bool) bool {

// configureASNumber configures the Node resource with the AS number specified
// in the environment, or is a no-op if not specified.
func configureASNumber(node *libapi.Node) {
// Returns true if the node object needs to be updated.
func configureASNumber(node *libapi.Node) bool {
// If Calico is running in policy only mode we don't need to write BGP related
// details to the Node.
if os.Getenv("CALICO_NETWORKING_BACKEND") == "none" {
return false
}
// Extract the AS number from the environment
asStr := os.Getenv("AS")
if asStr != "" {
Expand All @@ -700,6 +704,7 @@ func configureASNumber(node *libapi.Node) {
} else {
log.Infof("Using AS number specified in environment (AS=%s)", asNum)
node.Spec.BGP.ASNumber = &asNum
return true
}
} else {
if node.Spec.BGP.ASNumber == nil {
Expand All @@ -708,6 +713,7 @@ func configureASNumber(node *libapi.Node) {
log.Infof("Using AS number %s configured in node resource", node.Spec.BGP.ASNumber)
}
}
return false
}

// generateIPv6ULAPrefix return a random generated ULA IPv6 prefix as per RFC 4193. The pool
Expand Down
17 changes: 9 additions & 8 deletions node/pkg/lifecycle/startup/startup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func makeK8sNode(ipv4 string, ipv6 string) *v1.Node {
}

var _ = DescribeTable("Node IP detection failure cases",
func(networkingBackend string, expectedExitCode int, rrCId string) {
func(networkingBackend string, expectedExitCode int, rrCId string, expectedUpdate bool) {
os.Setenv("CALICO_NETWORKING_BACKEND", networkingBackend)
os.Setenv("IP", "none")
os.Setenv("IP6", "")
Expand All @@ -113,16 +113,17 @@ var _ = DescribeTable("Node IP detection failure cases",
node.Spec.BGP = &libapi.NodeBGPSpec{RouteReflectorClusterID: rrCId}
}

_ = configureAndCheckIPAddressSubnets(context.Background(), c, &node, &v1.Node{})
updated := configureAndCheckIPAddressSubnets(context.Background(), c, &node, &v1.Node{})
Expect(updated).To(Equal(expectedUpdate))
Expect(my_ec).To(Equal(expectedExitCode))
if rrCId != "" {
Expect(node.Spec.BGP).NotTo(BeNil())
}
},

Entry("startup should terminate if IP is set to none and Calico is used for networking", "bird", 1, ""),
Entry("startup should NOT terminate if IP is set to none and Calico is policy-only", "none", 0, ""),
Entry("startup should NOT terminate and BGPSpec shouldn't be set to nil", "none", 0, "rrClusterID"),
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),
)

var _ = Describe("Default IPv4 pool CIDR", func() {
Expand Down Expand Up @@ -876,7 +877,7 @@ var _ = Describe("FV tests against a real etcd", func() {
os.Setenv(env.key, env.value)
}

configureNodeRef(node)
Expect(configureNodeRef(node)).To(Equal(true))
// If we receive an invalid env var then none will be set.
if len(node.Spec.OrchRefs) > 0 {
ref := node.Spec.OrchRefs[0]
Expand All @@ -893,7 +894,7 @@ var _ = Describe("FV tests against a real etcd", func() {
os.Setenv("CALICO_UNKNOWN_NODE_REF", "node1")

node := &libapi.Node{}
configureNodeRef(node)
Expect(configureNodeRef(node)).To(Equal(false))

Expect(node.Spec.OrchRefs).To(HaveLen(0))
})
Expand All @@ -902,7 +903,7 @@ var _ = Describe("FV tests against a real etcd", func() {

node := &libapi.Node{}
node.Spec.OrchRefs = append(node.Spec.OrchRefs, libapi.OrchRef{"node1", "k8s"}) // nolint: vet
configureNodeRef(node)
Expect(configureNodeRef(node)).To(Equal(true))

Expect(node.Spec.OrchRefs).To(HaveLen(1))
})
Expand Down