TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-23 18:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to tailscale 1.20.4

Browse Source
This commit is contained in:
Kristoffer Dalby 2022-02-11 08:39:00 +00:00
parent 8c79165b0d
commit ba8afdb7be
3 changed files with 62 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -40,7 +40,7 @@ require (
gorm.io/driver/sqlite v1.1.5 gorm.io/driver/sqlite v1.1.5
gorm.io/gorm v1.21.15 gorm.io/gorm v1.21.15
inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
tailscale.com v1.20.3 tailscale.com v1.20.4
) )
require ( require (

2
go.sum
View File

@ -1411,3 +1411,5 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
tailscale.com v1.20.3 h1:C3g2AgmQaOi0YT5dAal9mslugPXMxwj0EXY7YfL2QrA= tailscale.com v1.20.3 h1:C3g2AgmQaOi0YT5dAal9mslugPXMxwj0EXY7YfL2QrA=
tailscale.com v1.20.3/go.mod h1:kjVy3ji2OH5lZhPLIIRacoY3CN4Bo3Yyb2mtoM8nfJ4= tailscale.com v1.20.3/go.mod h1:kjVy3ji2OH5lZhPLIIRacoY3CN4Bo3Yyb2mtoM8nfJ4=
tailscale.com v1.20.4 h1:7cl/Q2Sbo2Jb2dX7zA+Exbbl7DT5UGZ4iGhQ2xj23X0=
tailscale.com v1.20.4/go.mod h1:kjVy3ji2OH5lZhPLIIRacoY3CN4Bo3Yyb2mtoM8nfJ4=

114
integration_test.go
View File

@ -28,7 +28,7 @@ import (
"tailscale.com/ipn/ipnstate" "tailscale.com/ipn/ipnstate"
) )
var tailscaleVersions = []string{"1.20.2", "1.18.2", "1.16.2", "1.14.3", "1.12.3"} var tailscaleVersions = []string{"1.20.4", "1.18.2", "1.16.2", "1.14.3", "1.12.3"}
type TestNamespace struct { type TestNamespace struct {
count int count int
@ -375,7 +375,7 @@ func (s *IntegrationTestSuite) TestGetIpAddresses() {
ips, err := getIPs(scales.tailscales) ips, err := getIPs(scales.tailscales)
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
for hostname, _ := range scales.tailscales { for hostname := range scales.tailscales {
ips := ips[hostname] ips := ips[hostname]
for _, ip := range ips { for _, ip := range ips {
s.T().Run(hostname, func(t *testing.T) { s.T().Run(hostname, func(t *testing.T) {
@ -464,32 +464,33 @@ func (s *IntegrationTestSuite) TestPingAllPeersByAddress() {
if peername == hostname { if peername == hostname {
continue continue
} }
s.T().Run(fmt.Sprintf("%s-%s-%d", hostname, peername, i), func(t *testing.T) { s.T().
// We are only interested in "direct ping" which means what we Run(fmt.Sprintf("%s-%s-%d", hostname, peername, i), func(t *testing.T) {
// might need a couple of more attempts before reaching the node. // We are only interested in "direct ping" which means what we
command := []string{ // might need a couple of more attempts before reaching the node.
"tailscale", "ping", command := []string{
"--timeout=1s", "tailscale", "ping",
"--c=10", "--timeout=1s",
"--until-direct=true", "--c=10",
ip.String(), "--until-direct=true",
} ip.String(),
}
fmt.Printf( fmt.Printf(
"Pinging from %s to %s (%s)\n", "Pinging from %s to %s (%s)\n",
hostname, hostname,
peername, peername,
ip, ip,
) )
result, err := ExecuteCommand( result, err := ExecuteCommand(
&tailscale, &tailscale,
command, command,
[]string{}, []string{},
) )
assert.Nil(t, err) assert.Nil(t, err)
fmt.Printf("Result for %s: %s\n", hostname, result) fmt.Printf("Result for %s: %s\n", hostname, result)
assert.Contains(t, result, "pong") assert.Contains(t, result, "pong")
}) })
} }
} }
} }
@ -569,32 +570,33 @@ func (s *IntegrationTestSuite) TestSharedNodes() {
if peername == hostname { if peername == hostname {
continue continue
} }
s.T().Run(fmt.Sprintf("%s-%s-%d", hostname, peername, i), func(t *testing.T) { s.T().
// We are only interested in "direct ping" which means what we Run(fmt.Sprintf("%s-%s-%d", hostname, peername, i), func(t *testing.T) {
// might need a couple of more attempts before reaching the node. // We are only interested in "direct ping" which means what we
command := []string{ // might need a couple of more attempts before reaching the node.
"tailscale", "ping", command := []string{
"--timeout=15s", "tailscale", "ping",
"--c=20", "--timeout=15s",
"--until-direct=true", "--c=20",
ip.String(), "--until-direct=true",
} ip.String(),
}
fmt.Printf( fmt.Printf(
"Pinging from %s to %s (%s)\n", "Pinging from %s to %s (%s)\n",
hostname, hostname,
peername, peername,
ip, ip,
) )
result, err := ExecuteCommand( result, err := ExecuteCommand(
&tailscale, &tailscale,
command, command,
[]string{}, []string{},
) )
assert.Nil(t, err) assert.Nil(t, err)
fmt.Printf("Result for %s: %s\n", hostname, result) fmt.Printf("Result for %s: %s\n", hostname, result)
assert.Contains(t, result, "pong") assert.Contains(t, result, "pong")
}) })
} }
} }
} }
@ -625,7 +627,7 @@ func (s *IntegrationTestSuite) TestTailDrop() {
[]string{}, []string{},
) )
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
for peername, _ := range ips { for peername := range ips {
if peername == hostname { if peername == hostname {
continue continue
} }
@ -705,7 +707,7 @@ func (s *IntegrationTestSuite) TestPingAllPeersByHostname() {
ips, err := getIPs(scales.tailscales) ips, err := getIPs(scales.tailscales)
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
for hostname, tailscale := range scales.tailscales { for hostname, tailscale := range scales.tailscales {
for peername, _ := range ips { for peername := range ips {
if peername == hostname { if peername == hostname {
continue continue
} }
@ -774,7 +776,9 @@ func (s *IntegrationTestSuite) TestMagicDNS() {
} }
} }
func getIPs(tailscales map[string]dockertest.Resource) (map[string][]netaddr.IP, error) { func getIPs(
tailscales map[string]dockertest.Resource,
) (map[string][]netaddr.IP, error) {
ips := make(map[string][]netaddr.IP) ips := make(map[string][]netaddr.IP)
for hostname, tailscale := range tailscales { for hostname, tailscale := range tailscales {
command := []string{"tailscale", "ip"} command := []string{"tailscale", "ip"}