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
46c8b075
Unverified
Commit
46c8b075
authored
Apr 02, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Apr 02, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #76025 from neolit123/fix-panic-apps-daemon-set
test/e2e/apps: fix panic in DaemonSet tests due to legacy scheme
parents
d7d852a3
405f9eb7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
BUILD
test/e2e/apps/BUILD
+0
-1
daemon_set.go
test/e2e/apps/daemon_set.go
+3
-3
No files found.
test/e2e/apps/BUILD
View file @
46c8b075
...
...
@@ -23,7 +23,6 @@ go_library(
],
importpath = "k8s.io/kubernetes/test/e2e/apps",
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/v1/pod:go_default_library",
"//pkg/apis/apps:go_default_library",
"//pkg/apis/batch:go_default_library",
...
...
test/e2e/apps/daemon_set.go
View file @
46c8b075
...
...
@@ -31,7 +31,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
clientset
"k8s.io/client-go/kubernetes"
"k8s.io/
kubernetes/pkg/api/legacy
scheme"
"k8s.io/
client-go/kubernetes/
scheme"
podutil
"k8s.io/kubernetes/pkg/api/v1/pod"
extensionsinternal
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/controller/daemon"
...
...
@@ -78,12 +78,12 @@ var _ = SIGDescribe("Daemon set [Serial]", func() {
}
}
if
daemonsets
,
err
:=
f
.
ClientSet
.
AppsV1
()
.
DaemonSets
(
f
.
Namespace
.
Name
)
.
List
(
metav1
.
ListOptions
{});
err
==
nil
{
framework
.
Logf
(
"daemonset: %s"
,
runtime
.
EncodeOrDie
(
legacyscheme
.
Codecs
.
LegacyCodec
(
legacy
scheme
.
Scheme
.
PrioritizedVersionsAllGroups
()
...
),
daemonsets
))
framework
.
Logf
(
"daemonset: %s"
,
runtime
.
EncodeOrDie
(
scheme
.
Codecs
.
LegacyCodec
(
scheme
.
Scheme
.
PrioritizedVersionsAllGroups
()
...
),
daemonsets
))
}
else
{
framework
.
Logf
(
"unable to dump daemonsets: %v"
,
err
)
}
if
pods
,
err
:=
f
.
ClientSet
.
CoreV1
()
.
Pods
(
f
.
Namespace
.
Name
)
.
List
(
metav1
.
ListOptions
{});
err
==
nil
{
framework
.
Logf
(
"pods: %s"
,
runtime
.
EncodeOrDie
(
legacyscheme
.
Codecs
.
LegacyCodec
(
legacy
scheme
.
Scheme
.
PrioritizedVersionsAllGroups
()
...
),
pods
))
framework
.
Logf
(
"pods: %s"
,
runtime
.
EncodeOrDie
(
scheme
.
Codecs
.
LegacyCodec
(
scheme
.
Scheme
.
PrioritizedVersionsAllGroups
()
...
),
pods
))
}
else
{
framework
.
Logf
(
"unable to dump pods: %v"
,
err
)
}
...
...
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