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
e504e5a3
Commit
e504e5a3
authored
Nov 15, 2017
by
Lantao Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wait for server resources.
parent
ded83878
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
3 deletions
+27
-3
util.go
test/e2e/framework/util.go
+27
-3
No files found.
test/e2e/framework/util.go
View file @
e504e5a3
...
@@ -1165,12 +1165,14 @@ func hasRemainingContent(c clientset.Interface, clientPool dynamic.ClientPool, n
...
@@ -1165,12 +1165,14 @@ func hasRemainingContent(c clientset.Interface, clientPool dynamic.ClientPool, n
}
}
// find out what content is supported on the server
// find out what content is supported on the server
resources
,
err
:=
c
.
Discovery
()
.
ServerPreferredNamespacedResources
()
// Since extension apiserver is not always available, e.g. metrics server sometimes goes down,
if
err
!=
nil
&&
!
isDynamicDiscoveryError
(
err
)
{
// add retry here.
resources
,
err
:=
waitForServerPreferredNamespacedResources
(
c
.
Discovery
(),
30
*
time
.
Second
)
if
err
!=
nil
{
return
false
,
err
return
false
,
err
}
}
groupVersionResources
,
err
:=
discovery
.
GroupVersionResources
(
resources
)
groupVersionResources
,
err
:=
discovery
.
GroupVersionResources
(
resources
)
if
err
!=
nil
&&
!
isDynamicDiscoveryError
(
err
)
{
if
err
!=
nil
{
return
false
,
err
return
false
,
err
}
}
...
@@ -5100,3 +5102,25 @@ func DsFromManifest(url string) (*extensions.DaemonSet, error) {
...
@@ -5100,3 +5102,25 @@ func DsFromManifest(url string) (*extensions.DaemonSet, error) {
}
}
return
&
controller
,
nil
return
&
controller
,
nil
}
}
// waitForServerPreferredNamespacedResources waits until server preferred namespaced resources could be successfully discovered.
// TODO: Fix https://github.com/kubernetes/kubernetes/issues/55768 and remove the following retry.
func
waitForServerPreferredNamespacedResources
(
d
discovery
.
DiscoveryInterface
,
timeout
time
.
Duration
)
([]
*
metav1
.
APIResourceList
,
error
)
{
Logf
(
"Waiting up to %v for server preferred namespaced resources to be successfully discovered"
,
timeout
)
var
resources
[]
*
metav1
.
APIResourceList
if
err
:=
wait
.
PollImmediate
(
Poll
,
timeout
,
func
()
(
bool
,
error
)
{
var
err
error
resources
,
err
=
d
.
ServerPreferredNamespacedResources
()
if
err
==
nil
||
isDynamicDiscoveryError
(
err
)
{
return
true
,
nil
}
if
!
discovery
.
IsGroupDiscoveryFailedError
(
err
)
{
return
false
,
err
}
Logf
(
"Error discoverying server preferred namespaced resources: %v, retrying in %v."
,
err
,
Poll
)
return
false
,
nil
});
err
!=
nil
{
return
nil
,
err
}
return
resources
,
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