This repository has been archived by the owner on Jul 1, 2023. It is now read-only.
forked from flannel-io/flannel
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
vxlan: Generate MAC address before creating a link
systemd 242+ assigns MAC addresses for all virtual devices which don't have the address assigned already. That resulted in systemd overriding MAC addresses of flannel.* interfaces. The fix which prevents systemd from setting the address is to define the concrete MAC address when creating the link. Fixes: flannel-io#1155 Ref: k3s-io/k3s#4188 Signed-off-by: Michal Rostecki <[email protected]> (cherry picked from commit 0198d5d)
- Loading branch information
1 parent
c570cc6
commit c419d06
Showing
3 changed files
with
74 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
// Copyright 2021 flannel authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package mac | ||
|
||
import ( | ||
"crypto/rand" | ||
"fmt" | ||
"net" | ||
) | ||
|
||
// NewHardwareAddr generates a new random hardware (MAC) address, local and | ||
// unicast. | ||
func NewHardwareAddr() (net.HardwareAddr, error) { | ||
hardwareAddr := make(net.HardwareAddr, 6) | ||
if _, err := rand.Read(hardwareAddr); err != nil { | ||
return nil, fmt.Errorf("could not generate random MAC address: %w", err) | ||
} | ||
|
||
// Ensure that address is locally administered and unicast. | ||
hardwareAddr[0] = (hardwareAddr[0] & 0xfe) | 0x02 | ||
|
||
return hardwareAddr, nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// Copyright 2021 flannel authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package mac | ||
|
||
import ( | ||
"testing" | ||
) | ||
|
||
func TestNewHardwareAddr(t *testing.T) { | ||
// Ignore the actual address, since it's random. | ||
// But an error should never be returned. | ||
_, err := NewHardwareAddr() | ||
if err != nil { | ||
t.Fatalf(err.Error()) | ||
} | ||
} |