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
13983e35
Unverified
Commit
13983e35
authored
Jun 13, 2023
by
Manuel Buil
Committed by
GitHub
Jun 13, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7759 from manuelbuil/removeLibvirtLines124
[Release 1.24] Remove unused libvirt config
parents
38e0baa9
d74fa4f4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
12 deletions
+4
-12
Vagrantfile
tests/e2e/dualstack/Vagrantfile
+0
-2
Vagrantfile
tests/e2e/externalip/Vagrantfile
+2
-10
validatecluster_test.go
tests/e2e/validatecluster/validatecluster_test.go
+2
-0
No files found.
tests/e2e/dualstack/Vagrantfile
View file @
13983e35
...
...
@@ -21,8 +21,6 @@ def provision(vm, roles, role_num, node_num)
vm
.
network
"private_network"
,
:ip
=>
node_ip4
,
:netmask
=>
"255.255.255.0"
,
:libvirt__dhcp_enabled
=>
false
,
:libvirt__forward_mode
=>
"none"
,
:libvirt__guest_ipv6
=>
"yes"
,
:libvirt__ipv6_address
=>
"
#{
NETWORK6_PREFIX
}
::1"
,
:libvirt__ipv6_prefix
=>
"64"
...
...
tests/e2e/externalip/Vagrantfile
View file @
13983e35
...
...
@@ -16,16 +16,8 @@ def provision(vm, roles, role_num, node_num)
vm
.
hostname
=
"
#{
roles
[
0
]
}
-
#{
role_num
}
"
node_ip4
=
"
#{
NETWORK4_PREFIX
}
.
#{
100
+
node_num
}
"
node_ip4_public
=
"
#{
PUBLIC_NETWORK4_PREFIX
}
.
#{
100
+
node_num
}
"
vm
.
network
"private_network"
,
:ip
=>
node_ip4
,
:netmask
=>
"255.255.255.0"
,
:libvirt__dhcp_enabled
=>
false
,
:libvirt__forward_mode
=>
"none"
vm
.
network
"private_network"
,
:ip
=>
node_ip4_public
,
:netmask
=>
"255.255.255.0"
,
:libvirt__dhcp_enabled
=>
false
,
:libvirt__forward_mode
=>
"none"
vm
.
network
"private_network"
,
:ip
=>
node_ip4
,
:netmask
=>
"255.255.255.0"
vm
.
network
"private_network"
,
:ip
=>
node_ip4_public
,
:netmask
=>
"255.255.255.0"
scripts_location
=
Dir
.
exists?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exists?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
...
...
tests/e2e/validatecluster/validatecluster_test.go
View file @
13983e35
...
...
@@ -345,6 +345,8 @@ var _ = Describe("Verify Create", Ordered, func() {
var
expectResult
=
[]
string
{
"client-ca.crt"
,
"client-ca.key"
,
"client-ca.nochain.crt"
,
"client-supervisor.crt"
,
"client-supervisor.key"
,
"dynamic-cert.json"
,
"peer-ca.crt"
,
"peer-ca.key"
,
"server-ca.crt"
,
"server-ca.key"
,
"request-header-ca.crt"
,
...
...
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