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
ae7d6285
Commit
ae7d6285
authored
Sep 09, 2022
by
Brad Davidson
Committed by
Brad Davidson
Sep 09, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix gofmt warnings
Signed-off-by:
Brad Davidson
<
brad.davidson@rancher.com
>
parent
1b806f5f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
5 deletions
+7
-5
.golangci.json
.golangci.json
+1
-0
log_linux.go
pkg/cli/cmds/log_linux.go
+1
-1
integration.go
tests/integration/integration.go
+4
-3
testutils.go
tests/terraform/testutils.go
+1
-1
No files found.
.golangci.json
View file @
ae7d6285
...
...
@@ -11,6 +11,7 @@
},
"run"
:
{
"skip-dirs"
:
[
"pkg/generated"
,
"build"
,
"contrib"
,
"manifests"
,
...
...
pkg/cli/cmds/log_linux.go
View file @
ae7d6285
...
...
@@ -83,7 +83,7 @@ func forkIfLoggingOrReaping() error {
return
nil
}
//reapChildren calls Wait4 whenever SIGCHLD is received
//
reapChildren calls Wait4 whenever SIGCHLD is received
func
reapChildren
()
{
sigs
:=
make
(
chan
os
.
Signal
,
1
)
signal
.
Notify
(
sigs
,
syscall
.
SIGCHLD
)
...
...
tests/integration/integration.go
View file @
ae7d6285
...
...
@@ -75,9 +75,10 @@ func IsExistingServer() bool {
// K3sCmd launches the provided K3s command via exec. Command blocks until finished.
// Command output from both Stderr and Stdout is provided via string. Input can
// be a single string with space separated args, or multiple string args
// cmdEx1, err := K3sCmd("etcd-snapshot", "ls")
// cmdEx2, err := K3sCmd("kubectl get pods -A")
// cmdEx2, err := K3sCmd("kubectl", "get", "pods", "-A")
//
// cmdEx1, err := K3sCmd("etcd-snapshot", "ls")
// cmdEx2, err := K3sCmd("kubectl get pods -A")
// cmdEx2, err := K3sCmd("kubectl", "get", "pods", "-A")
func
K3sCmd
(
inputArgs
...
string
)
(
string
,
error
)
{
if
!
IsRoot
()
{
return
""
,
errors
.
New
(
"integration tests must be run as sudo/root"
)
...
...
tests/terraform/testutils.go
View file @
ae7d6285
...
...
@@ -111,7 +111,7 @@ func RunCommand(cmd string) (string, error) {
return
string
(
out
),
err
}
//Used to count the pods using prefix passed in the list of pods
//
Used to count the pods using prefix passed in the list of pods
func
CountOfStringInSlice
(
str
string
,
pods
[]
Pod
)
int
{
count
:=
0
for
_
,
pod
:=
range
pods
{
...
...
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