Skip to content

Commit

Permalink
Revert "network/netplan: adjust link-local accordingly (#443)" (#448)
Browse files Browse the repository at this point in the history
This reverts commit 2a9cb58.
  • Loading branch information
dorileo authored Oct 10, 2024
1 parent d1029cc commit dbd1035
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions google_guest_agent/network/manager/netplan_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ type netplanEthernet struct {
DHCPv6 *bool `yaml:"dhcp6,omitempty"`

DHCP6Overrides *netplanDHCPOverrides `yaml:"dhcp6-overrides,omitempty"`

// LinkLocal defines the stack to be used for link local i.e: ipv4, ipv6 etc.
LinkLocal []string `yaml:"link-local,omitempty"`
}

// netplanDHCPOverrides sets the netplan dhcp-overrides configuration.
Expand Down Expand Up @@ -374,7 +371,6 @@ func (n *netplan) writeNetplanEthernetDropin(mtuMap map[string]int, interfaces,
DHCP4Overrides: &netplanDHCPOverrides{
UseDomains: shouldUseDomains(i),
},
LinkLocal: []string{"ipv4"},
}

if mtu, found := mtuMap[iface]; found {
Expand All @@ -386,7 +382,6 @@ func (n *netplan) writeNetplanEthernetDropin(mtuMap map[string]int, interfaces,
ne.DHCP6Overrides = &netplanDHCPOverrides{
UseDomains: shouldUseDomains(i),
}
ne.LinkLocal = append(ne.LinkLocal, "ipv6")
}

key := n.ID(iface)
Expand Down

0 comments on commit dbd1035

Please sign in to comment.