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
4dfdb154
Commit
4dfdb154
authored
Feb 09, 2016
by
Maisem Ali
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding testing-manifests to the test tar ball
parent
1168df93
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
5 additions
and
6 deletions
+5
-6
golang.sh
hack/lib/golang.sh
+1
-2
kubectl.go
test/e2e/kubectl.go
+1
-1
serviceloadbalancers.go
test/e2e/serviceloadbalancers.go
+3
-3
pod-with-readiness-probe.yaml
...e/testing-manifests/kubectl/pod-with-readiness-probe.yaml
+0
-0
haproxyrc.yaml
.../e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml
+0
-0
netexecrc.yaml
.../e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml
+0
-0
netexecsvc.yaml
...e2e/testing-manifests/serviceloadbalancer/netexecsvc.yaml
+0
-0
nginxrc.yaml
test/e2e/testing-manifests/serviceloadbalancer/nginxrc.yaml
+0
-0
nginxsvc.yaml
test/e2e/testing-manifests/serviceloadbalancer/nginxsvc.yaml
+0
-0
No files found.
hack/lib/golang.sh
View file @
4dfdb154
...
@@ -87,8 +87,7 @@ readonly KUBE_TEST_TARGETS=($(kube::golang::test_targets))
...
@@ -87,8 +87,7 @@ readonly KUBE_TEST_TARGETS=($(kube::golang::test_targets))
readonly
KUBE_TEST_BINARIES
=(
"
${
KUBE_TEST_TARGETS
[@]##*/
}
"
)
readonly
KUBE_TEST_BINARIES
=(
"
${
KUBE_TEST_TARGETS
[@]##*/
}
"
)
readonly
KUBE_TEST_BINARIES_WIN
=(
"
${
KUBE_TEST_BINARIES
[@]/%/.exe
}
"
)
readonly
KUBE_TEST_BINARIES_WIN
=(
"
${
KUBE_TEST_BINARIES
[@]/%/.exe
}
"
)
readonly
KUBE_TEST_PORTABLE
=(
readonly
KUBE_TEST_PORTABLE
=(
test
/images/network-tester/rc.json
test
/e2e/testing-manifests
test
/images/network-tester/service.json
test
/kubemark
test
/kubemark
hack/e2e.go
hack/e2e.go
hack/e2e-internal
hack/e2e-internal
...
...
test/e2e/kubectl.go
View file @
4dfdb154
...
@@ -170,7 +170,7 @@ var _ = Describe("Kubectl client", func() {
...
@@ -170,7 +170,7 @@ var _ = Describe("Kubectl client", func() {
var
podPath
string
var
podPath
string
BeforeEach
(
func
()
{
BeforeEach
(
func
()
{
podPath
=
filepath
.
Join
(
testContext
.
RepoRoot
,
"
examples/readiness-probe-pod"
)
podPath
=
filepath
.
Join
(
testContext
.
RepoRoot
,
"
test"
,
"e2e"
,
"testing-manifests"
,
"kubectl"
,
"pod-with-readiness-probe.yaml"
)
By
(
fmt
.
Sprintf
(
"creating the pod from %v"
,
podPath
))
By
(
fmt
.
Sprintf
(
"creating the pod from %v"
,
podPath
))
runKubectlOrDie
(
"create"
,
"-f"
,
podPath
,
fmt
.
Sprintf
(
"--namespace=%v"
,
ns
))
runKubectlOrDie
(
"create"
,
"-f"
,
podPath
,
fmt
.
Sprintf
(
"--namespace=%v"
,
ns
))
checkPodsRunningReady
(
c
,
ns
,
[]
string
{
simplePodName
},
podStartTimeout
)
checkPodsRunningReady
(
c
,
ns
,
[]
string
{
simplePodName
},
podStartTimeout
)
...
...
test/e2e/serviceloadbalancers.go
View file @
4dfdb154
...
@@ -38,7 +38,7 @@ func getLoadBalancerControllers(repoRoot string, client *client.Client) []LBCTes
...
@@ -38,7 +38,7 @@ func getLoadBalancerControllers(repoRoot string, client *client.Client) []LBCTes
return
[]
LBCTester
{
return
[]
LBCTester
{
&
haproxyControllerTester
{
&
haproxyControllerTester
{
name
:
"haproxy"
,
name
:
"haproxy"
,
cfg
:
filepath
.
Join
(
repoRoot
,
"test"
,
"e2e"
,
"testing-manifests"
,
"haproxyrc.yaml"
),
cfg
:
filepath
.
Join
(
repoRoot
,
"test"
,
"e2e"
,
"testing-manifests"
,
"
serviceloadbalancer"
,
"
haproxyrc.yaml"
),
client
:
client
,
client
:
client
,
},
},
}
}
...
@@ -49,8 +49,8 @@ func getIngManagers(repoRoot string, client *client.Client) []*ingManager {
...
@@ -49,8 +49,8 @@ func getIngManagers(repoRoot string, client *client.Client) []*ingManager {
return
[]
*
ingManager
{
return
[]
*
ingManager
{
{
{
name
:
"netexec"
,
name
:
"netexec"
,
rcCfgPaths
:
[]
string
{
filepath
.
Join
(
repoRoot
,
"test"
,
"e2e"
,
"testing-manifests"
,
"netexecrc.yaml"
)},
rcCfgPaths
:
[]
string
{
filepath
.
Join
(
repoRoot
,
"test"
,
"e2e"
,
"testing-manifests"
,
"
serviceloadbalancer"
,
"
netexecrc.yaml"
)},
svcCfgPaths
:
[]
string
{
filepath
.
Join
(
repoRoot
,
"test"
,
"e2e"
,
"testing-manifests"
,
"netexecsvc.yaml"
)},
svcCfgPaths
:
[]
string
{
filepath
.
Join
(
repoRoot
,
"test"
,
"e2e"
,
"testing-manifests"
,
"
serviceloadbalancer"
,
"
netexecsvc.yaml"
)},
svcNames
:
[]
string
{},
svcNames
:
[]
string
{},
client
:
client
,
client
:
client
,
},
},
...
...
examples/readiness-probe-pod
→
test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml
View file @
4dfdb154
File moved
test/e2e/testing-manifests/haproxyrc.yaml
→
test/e2e/testing-manifests/
serviceloadbalancer/
haproxyrc.yaml
View file @
4dfdb154
File moved
test/e2e/testing-manifests/netexecrc.yaml
→
test/e2e/testing-manifests/
serviceloadbalancer/
netexecrc.yaml
View file @
4dfdb154
File moved
test/e2e/testing-manifests/netexecsvc.yaml
→
test/e2e/testing-manifests/
serviceloadbalancer/
netexecsvc.yaml
View file @
4dfdb154
File moved
test/e2e/testing-manifests/nginxrc.yaml
→
test/e2e/testing-manifests/
serviceloadbalancer/
nginxrc.yaml
View file @
4dfdb154
File moved
test/e2e/testing-manifests/nginxsvc.yaml
→
test/e2e/testing-manifests/
serviceloadbalancer/
nginxsvc.yaml
View file @
4dfdb154
File moved
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