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
a41e4226
Commit
a41e4226
authored
Aug 26, 2015
by
Dan Winship
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop the "v" from GetIptablesVersionString() output
Neither of its callers wants it
parent
97a2cbc6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
proxier.go
pkg/proxy/iptables/proxier.go
+2
-3
iptables.go
pkg/util/iptables/iptables.go
+5
-8
No files found.
pkg/proxy/iptables/proxier.go
View file @
a41e4226
...
@@ -74,13 +74,12 @@ func ShouldUseIptablesProxier() (bool, error) {
...
@@ -74,13 +74,12 @@ func ShouldUseIptablesProxier() (bool, error) {
if
err
!=
nil
{
if
err
!=
nil
{
return
false
,
err
return
false
,
err
}
}
// returns "
v
X.X.X", err
// returns "X.X.X", err
versionString
,
err
:=
utiliptables
.
GetIptablesVersionString
(
exec
)
versionString
,
err
:=
utiliptables
.
GetIptablesVersionString
(
exec
)
if
err
!=
nil
{
if
err
!=
nil
{
return
false
,
err
return
false
,
err
}
}
// make a semver of the part after the v in "vX.X.X"
version
,
err
:=
semver
.
NewVersion
(
versionString
)
version
,
err
:=
semver
.
NewVersion
(
versionString
[
1
:
])
if
err
!=
nil
{
if
err
!=
nil
{
return
false
,
err
return
false
,
err
}
}
...
...
pkg/util/iptables/iptables.go
View file @
a41e4226
...
@@ -404,13 +404,11 @@ func getIptablesHasCheckCommand(exec utilexec.Interface) (bool, error) {
...
@@ -404,13 +404,11 @@ func getIptablesHasCheckCommand(exec utilexec.Interface) (bool, error) {
if
err
!=
nil
{
if
err
!=
nil
{
return
false
,
err
return
false
,
err
}
}
// Returns "vX.Y.Z".
vstring
,
err
:=
GetIptablesVersionString
(
exec
)
vstring
,
err
:=
GetIptablesVersionString
(
exec
)
if
err
!=
nil
{
if
err
!=
nil
{
return
false
,
err
return
false
,
err
}
}
// Make a semver of the part after the v in "vX.X.X".
version
,
err
:=
semver
.
NewVersion
(
vstring
)
version
,
err
:=
semver
.
NewVersion
(
vstring
[
1
:
])
if
err
!=
nil
{
if
err
!=
nil
{
return
false
,
err
return
false
,
err
}
}
...
@@ -420,19 +418,18 @@ func getIptablesHasCheckCommand(exec utilexec.Interface) (bool, error) {
...
@@ -420,19 +418,18 @@ func getIptablesHasCheckCommand(exec utilexec.Interface) (bool, error) {
return
true
,
nil
return
true
,
nil
}
}
// GetIptablesVersionString runs "iptables --version" to get the version string,
// GetIptablesVersionString runs "iptables --version" to get the version string
// then matches for vX.X.X e.g. if "iptables --version" outputs: "iptables v1.3.66"
// in the form "X.X.X"
// then it would would return "v1.3.66", nil
func
GetIptablesVersionString
(
exec
utilexec
.
Interface
)
(
string
,
error
)
{
func
GetIptablesVersionString
(
exec
utilexec
.
Interface
)
(
string
,
error
)
{
// this doesn't access mutable state so we don't need to use the interface / runner
// this doesn't access mutable state so we don't need to use the interface / runner
bytes
,
err
:=
exec
.
Command
(
cmdIptables
,
"--version"
)
.
CombinedOutput
()
bytes
,
err
:=
exec
.
Command
(
cmdIptables
,
"--version"
)
.
CombinedOutput
()
if
err
!=
nil
{
if
err
!=
nil
{
return
""
,
err
return
""
,
err
}
}
versionMatcher
:=
regexp
.
MustCompile
(
"v
[0-9]+
\\
.[0-9]+
\\
.[0-9]+
"
)
versionMatcher
:=
regexp
.
MustCompile
(
"v
([0-9]+
\\
.[0-9]+
\\
.[0-9]+)
"
)
match
:=
versionMatcher
.
FindStringSubmatch
(
string
(
bytes
))
match
:=
versionMatcher
.
FindStringSubmatch
(
string
(
bytes
))
if
match
==
nil
{
if
match
==
nil
{
return
""
,
fmt
.
Errorf
(
"no iptables version found in string: %s"
,
bytes
)
return
""
,
fmt
.
Errorf
(
"no iptables version found in string: %s"
,
bytes
)
}
}
return
match
[
0
],
nil
return
match
[
1
],
nil
}
}
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