Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
dd3f3dba
Commit
dd3f3dba
authored
Oct 10, 2022
by
Manuel Buil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dualStack test
Signed-off-by:
Manuel Buil
<
mbuil@suse.com
>
parent
06d81cb9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
Vagrantfile
tests/e2e/dualstack/Vagrantfile
+2
-1
dualstack_test.go
tests/e2e/dualstack/dualstack_test.go
+2
-2
ipv6.sh
tests/e2e/scripts/ipv6.sh
+4
-3
No files found.
tests/e2e/dualstack/Vagrantfile
View file @
dd3f3dba
...
...
@@ -16,6 +16,7 @@ def provision(vm, roles, role_num, node_num)
vm
.
hostname
=
"
#{
roles
[
0
]
}
-
#{
role_num
}
"
node_ip4
=
"
#{
NETWORK4_PREFIX
}
.
#{
100
+
node_num
}
"
node_ip6
=
"
#{
NETWORK6_PREFIX
}
::
#{
10
+
node_num
}
"
node_ip6_gw
=
"
#{
NETWORK6_PREFIX
}
::1"
# Only works with libvirt, which allows IPv4 + IPv6 on a single network/interface
vm
.
network
"private_network"
,
:ip
=>
node_ip4
,
...
...
@@ -32,7 +33,7 @@ def provision(vm, roles, role_num, node_num)
defaultOSConfigure
(
vm
)
vm
.
provision
"IPv6 Setup"
,
type:
"shell"
,
path:
scripts_location
+
"/ipv6.sh"
,
args:
[
node_ip4
,
node_ip6
,
vm
.
box
.
to_s
]
vm
.
provision
"IPv6 Setup"
,
type:
"shell"
,
path:
scripts_location
+
"/ipv6.sh"
,
args:
[
node_ip4
,
node_ip6
,
node_ip6_gw
,
vm
.
box
.
to_s
]
install_type
=
getInstallType
(
vm
,
RELEASE_VERSION
,
GITHUB_BRANCH
)
vm
.
provision
"Ping Check"
,
type:
"shell"
,
inline:
"ping -c 2 k3s.io"
...
...
tests/e2e/dualstack/dualstack_test.go
View file @
dd3f3dba
...
...
@@ -117,7 +117,7 @@ var _ = Describe("Verify DualStack Configuration", Ordered, func() {
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
for
_
,
node
:=
range
nodeIPs
{
Expect
(
node
.
ipv4
)
.
Should
(
ContainSubstring
(
"10.10.10"
))
Expect
(
node
.
ipv6
)
.
Should
(
ContainSubstring
(
"
a
11:decf:c0ff"
))
Expect
(
node
.
ipv6
)
.
Should
(
ContainSubstring
(
"
fd
11:decf:c0ff"
))
}
})
It
(
"Verifies that each pod has IPv4 and IPv6"
,
func
()
{
...
...
@@ -125,7 +125,7 @@ var _ = Describe("Verify DualStack Configuration", Ordered, func() {
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
for
_
,
pod
:=
range
podIPs
{
Expect
(
pod
.
ipv4
)
.
Should
(
Or
(
ContainSubstring
(
"10.10.10"
),
ContainSubstring
(
"10.42."
)),
pod
.
name
)
Expect
(
pod
.
ipv6
)
.
Should
(
Or
(
ContainSubstring
(
"
a
11:decf:c0ff"
),
ContainSubstring
(
"2001:cafe:42"
)),
pod
.
name
)
Expect
(
pod
.
ipv6
)
.
Should
(
Or
(
ContainSubstring
(
"
fd
11:decf:c0ff"
),
ContainSubstring
(
"2001:cafe:42"
)),
pod
.
name
)
}
})
...
...
tests/e2e/scripts/ipv6.sh
View file @
dd3f3dba
#!/bin/bash
ip4_addr
=
$1
ip6_addr
=
$2
os
=
$3
ip6_addr_gw
=
$3
os
=
$4
sysctl
-w
net.ipv6.conf.all.disable_ipv6
=
0
sysctl
-w
net.ipv6.conf.eth1.accept_dad
=
0
...
...
@@ -19,4 +20,5 @@ elif [ -z "${os##*alpine*}" ]; then
else
ip
-6
addr add
"
$ip6_addr
"
/64 dev eth1
fi
ip addr show dev eth1
\ No newline at end of file
ip addr show dev eth1
ip
-6
r add default via
"
$ip6_addr_gw
"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment