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
42e2ca8c
Commit
42e2ca8c
authored
Sep 07, 2017
by
Kubernetes Submit Queue
Committed by
GitHub
Sep 07, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #52079 from sttts/sttts-clientgen-panic-empty-group
Automatic merge from submit-queue (batch tested with PRs 52073, 52079) client-gen: avoid panic for empty groups
parents
7386f0df
4039a722
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
generator_fake_for_group.go
...md/client-gen/generators/fake/generator_fake_for_group.go
+1
-1
generator_for_expansion.go
...ator/cmd/client-gen/generators/generator_for_expansion.go
+1
-1
generator_for_group.go
...enerator/cmd/client-gen/generators/generator_for_group.go
+1
-1
No files found.
staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go
View file @
42e2ca8c
...
@@ -45,7 +45,7 @@ var _ generator.Generator = &genFakeForGroup{}
...
@@ -45,7 +45,7 @@ var _ generator.Generator = &genFakeForGroup{}
// We only want to call GenerateType() once per group.
// We only want to call GenerateType() once per group.
func
(
g
*
genFakeForGroup
)
Filter
(
c
*
generator
.
Context
,
t
*
types
.
Type
)
bool
{
func
(
g
*
genFakeForGroup
)
Filter
(
c
*
generator
.
Context
,
t
*
types
.
Type
)
bool
{
return
t
==
g
.
types
[
0
]
return
len
(
g
.
types
)
==
0
||
t
==
g
.
types
[
0
]
}
}
func
(
g
*
genFakeForGroup
)
Namers
(
c
*
generator
.
Context
)
namer
.
NameSystems
{
func
(
g
*
genFakeForGroup
)
Namers
(
c
*
generator
.
Context
)
namer
.
NameSystems
{
...
...
staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_expansion.go
View file @
42e2ca8c
...
@@ -36,7 +36,7 @@ type genExpansion struct {
...
@@ -36,7 +36,7 @@ type genExpansion struct {
// We only want to call GenerateType() once per group.
// We only want to call GenerateType() once per group.
func
(
g
*
genExpansion
)
Filter
(
c
*
generator
.
Context
,
t
*
types
.
Type
)
bool
{
func
(
g
*
genExpansion
)
Filter
(
c
*
generator
.
Context
,
t
*
types
.
Type
)
bool
{
return
t
==
g
.
types
[
0
]
return
len
(
g
.
types
)
==
0
||
t
==
g
.
types
[
0
]
}
}
func
(
g
*
genExpansion
)
GenerateType
(
c
*
generator
.
Context
,
t
*
types
.
Type
,
w
io
.
Writer
)
error
{
func
(
g
*
genExpansion
)
GenerateType
(
c
*
generator
.
Context
,
t
*
types
.
Type
,
w
io
.
Writer
)
error
{
...
...
staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go
View file @
42e2ca8c
...
@@ -46,7 +46,7 @@ var _ generator.Generator = &genGroup{}
...
@@ -46,7 +46,7 @@ var _ generator.Generator = &genGroup{}
// We only want to call GenerateType() once per group.
// We only want to call GenerateType() once per group.
func
(
g
*
genGroup
)
Filter
(
c
*
generator
.
Context
,
t
*
types
.
Type
)
bool
{
func
(
g
*
genGroup
)
Filter
(
c
*
generator
.
Context
,
t
*
types
.
Type
)
bool
{
return
t
==
g
.
types
[
0
]
return
len
(
g
.
types
)
==
0
||
t
==
g
.
types
[
0
]
}
}
func
(
g
*
genGroup
)
Namers
(
c
*
generator
.
Context
)
namer
.
NameSystems
{
func
(
g
*
genGroup
)
Namers
(
c
*
generator
.
Context
)
namer
.
NameSystems
{
...
...
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