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
b84e53bc
Commit
b84e53bc
authored
Sep 15, 2016
by
nikhiljindal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow describe ns to pass if server does not support resource quotas and limit ranges
parent
1fcaf3aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
3 deletions
+31
-3
describe.go
pkg/kubectl/describe.go
+14
-3
describe_test.go
pkg/kubectl/describe_test.go
+17
-0
No files found.
pkg/kubectl/describe.go
View file @
b84e53bc
...
@@ -173,13 +173,24 @@ func (d *NamespaceDescriber) Describe(namespace, name string, describerSettings
...
@@ -173,13 +173,24 @@ func (d *NamespaceDescriber) Describe(namespace, name string, describerSettings
}
}
resourceQuotaList
,
err
:=
d
.
Core
()
.
ResourceQuotas
(
name
)
.
List
(
api
.
ListOptions
{})
resourceQuotaList
,
err
:=
d
.
Core
()
.
ResourceQuotas
(
name
)
.
List
(
api
.
ListOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
return
""
,
err
if
errors
.
IsNotFound
(
err
)
{
// Server does not support resource quotas.
// Not an error, will not show resource quotas information.
resourceQuotaList
=
nil
}
else
{
return
""
,
err
}
}
}
limitRangeList
,
err
:=
d
.
Core
()
.
LimitRanges
(
name
)
.
List
(
api
.
ListOptions
{})
limitRangeList
,
err
:=
d
.
Core
()
.
LimitRanges
(
name
)
.
List
(
api
.
ListOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
return
""
,
err
if
errors
.
IsNotFound
(
err
)
{
// Server does not support limit ranges.
// Not an error, will not show limit ranges information.
limitRangeList
=
nil
}
else
{
return
""
,
err
}
}
}
return
describeNamespace
(
ns
,
resourceQuotaList
,
limitRangeList
)
return
describeNamespace
(
ns
,
resourceQuotaList
,
limitRangeList
)
}
}
...
...
pkg/kubectl/describe_test.go
View file @
b84e53bc
...
@@ -86,6 +86,23 @@ func TestDescribePodTolerations(t *testing.T) {
...
@@ -86,6 +86,23 @@ func TestDescribePodTolerations(t *testing.T) {
}
}
}
}
func
TestDescribeNamespace
(
t
*
testing
.
T
)
{
fake
:=
fake
.
NewSimpleClientset
(
&
api
.
Namespace
{
ObjectMeta
:
api
.
ObjectMeta
{
Name
:
"myns"
,
},
})
c
:=
&
describeClient
{
T
:
t
,
Namespace
:
""
,
Interface
:
fake
}
d
:=
NamespaceDescriber
{
c
}
out
,
err
:=
d
.
Describe
(
""
,
"myns"
,
DescriberSettings
{
ShowEvents
:
true
})
if
err
!=
nil
{
t
.
Errorf
(
"unexpected error: %v"
,
err
)
}
if
!
strings
.
Contains
(
out
,
"myns"
)
{
t
.
Errorf
(
"unexpected out: %s"
,
out
)
}
}
func
TestDescribeService
(
t
*
testing
.
T
)
{
func
TestDescribeService
(
t
*
testing
.
T
)
{
fake
:=
fake
.
NewSimpleClientset
(
&
api
.
Service
{
fake
:=
fake
.
NewSimpleClientset
(
&
api
.
Service
{
ObjectMeta
:
api
.
ObjectMeta
{
ObjectMeta
:
api
.
ObjectMeta
{
...
...
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