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
916ca9cc
Commit
916ca9cc
authored
Mar 09, 2015
by
nikhiljindal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changing v1beta3 field selectors to be camelCased
parent
2a7be561
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
15 deletions
+15
-15
conversion.go
pkg/api/v1beta1/conversion.go
+2
-2
conversion.go
pkg/api/v1beta2/conversion.go
+2
-2
conversion.go
pkg/api/v1beta3/conversion.go
+2
-2
listwatch_test.go
pkg/client/cache/listwatch_test.go
+1
-1
apiserver.go
pkg/kubelet/config/apiserver.go
+1
-1
etcd_test.go
pkg/registry/pod/etcd/etcd_test.go
+4
-4
rest.go
pkg/registry/pod/rest.go
+2
-2
factory.go
plugin/pkg/scheduler/factory/factory.go
+1
-1
No files found.
pkg/api/v1beta1/conversion.go
View file @
916ca9cc
...
@@ -1337,12 +1337,12 @@ func init() {
...
@@ -1337,12 +1337,12 @@ func init() {
case
"name"
:
case
"name"
:
return
"name"
,
value
,
nil
return
"name"
,
value
,
nil
case
"DesiredState.Host"
:
case
"DesiredState.Host"
:
return
"
Status.H
ost"
,
value
,
nil
return
"
status.h
ost"
,
value
,
nil
case
"DesiredState.Status"
:
case
"DesiredState.Status"
:
podStatus
:=
PodStatus
(
value
)
podStatus
:=
PodStatus
(
value
)
var
internalValue
newer
.
PodPhase
var
internalValue
newer
.
PodPhase
newer
.
Scheme
.
Convert
(
&
podStatus
,
&
internalValue
)
newer
.
Scheme
.
Convert
(
&
podStatus
,
&
internalValue
)
return
"
Status.P
hase"
,
string
(
internalValue
),
nil
return
"
status.p
hase"
,
string
(
internalValue
),
nil
default
:
default
:
return
""
,
""
,
fmt
.
Errorf
(
"field label not supported: %s"
,
label
)
return
""
,
""
,
fmt
.
Errorf
(
"field label not supported: %s"
,
label
)
}
}
...
...
pkg/api/v1beta2/conversion.go
View file @
916ca9cc
...
@@ -1253,12 +1253,12 @@ func init() {
...
@@ -1253,12 +1253,12 @@ func init() {
case
"name"
:
case
"name"
:
return
"name"
,
value
,
nil
return
"name"
,
value
,
nil
case
"DesiredState.Host"
:
case
"DesiredState.Host"
:
return
"
Status.H
ost"
,
value
,
nil
return
"
status.h
ost"
,
value
,
nil
case
"DesiredState.Status"
:
case
"DesiredState.Status"
:
podStatus
:=
PodStatus
(
value
)
podStatus
:=
PodStatus
(
value
)
var
internalValue
newer
.
PodPhase
var
internalValue
newer
.
PodPhase
newer
.
Scheme
.
Convert
(
&
podStatus
,
&
internalValue
)
newer
.
Scheme
.
Convert
(
&
podStatus
,
&
internalValue
)
return
"
Status.P
hase"
,
string
(
internalValue
),
nil
return
"
status.p
hase"
,
string
(
internalValue
),
nil
default
:
default
:
return
""
,
""
,
fmt
.
Errorf
(
"field label not supported: %s"
,
label
)
return
""
,
""
,
fmt
.
Errorf
(
"field label not supported: %s"
,
label
)
}
}
...
...
pkg/api/v1beta3/conversion.go
View file @
916ca9cc
...
@@ -29,9 +29,9 @@ func init() {
...
@@ -29,9 +29,9 @@ func init() {
switch
label
{
switch
label
{
case
"name"
:
case
"name"
:
fallthrough
fallthrough
case
"
Status.P
hase"
:
case
"
status.p
hase"
:
fallthrough
fallthrough
case
"
Status.H
ost"
:
case
"
status.h
ost"
:
return
label
,
value
,
nil
return
label
,
value
,
nil
default
:
default
:
return
""
,
""
,
fmt
.
Errorf
(
"field label not supported: %s"
,
label
)
return
""
,
""
,
fmt
.
Errorf
(
"field label not supported: %s"
,
label
)
...
...
pkg/client/cache/listwatch_test.go
View file @
916ca9cc
...
@@ -53,7 +53,7 @@ func getHostFieldLabel() string {
...
@@ -53,7 +53,7 @@ func getHostFieldLabel() string {
case
"v1beta1"
,
"v1beta2"
:
case
"v1beta1"
,
"v1beta2"
:
return
"DesiredState.Host"
return
"DesiredState.Host"
default
:
default
:
return
"
Status.H
ost"
return
"
status.h
ost"
}
}
}
}
...
...
pkg/kubelet/config/apiserver.go
View file @
916ca9cc
...
@@ -57,6 +57,6 @@ func getHostFieldLabel(apiVersion string) string {
...
@@ -57,6 +57,6 @@ func getHostFieldLabel(apiVersion string) string {
case
"v1beta1"
,
"v1beta2"
:
case
"v1beta1"
,
"v1beta2"
:
return
"DesiredState.Host"
return
"DesiredState.Host"
default
:
default
:
return
"
Status.H
ost"
return
"
status.h
ost"
}
}
}
}
pkg/registry/pod/etcd/etcd_test.go
View file @
916ca9cc
...
@@ -337,16 +337,16 @@ func TestListPodListSelection(t *testing.T) {
...
@@ -337,16 +337,16 @@ func TestListPodListSelection(t *testing.T) {
label
:
"label=qux"
,
label
:
"label=qux"
,
expectedIDs
:
util
.
NewStringSet
(
"qux"
),
expectedIDs
:
util
.
NewStringSet
(
"qux"
),
},
{
},
{
field
:
"
Status.P
hase=Failed"
,
field
:
"
status.p
hase=Failed"
,
expectedIDs
:
util
.
NewStringSet
(
"baz"
),
expectedIDs
:
util
.
NewStringSet
(
"baz"
),
},
{
},
{
field
:
"
Status.H
ost=barhost"
,
field
:
"
status.h
ost=barhost"
,
expectedIDs
:
util
.
NewStringSet
(
"bar"
),
expectedIDs
:
util
.
NewStringSet
(
"bar"
),
},
{
},
{
field
:
"
Status.H
ost="
,
field
:
"
status.h
ost="
,
expectedIDs
:
util
.
NewStringSet
(
"foo"
,
"baz"
,
"qux"
,
"zot"
),
expectedIDs
:
util
.
NewStringSet
(
"foo"
,
"baz"
,
"qux"
,
"zot"
),
},
{
},
{
field
:
"
Status.H
ost!="
,
field
:
"
status.h
ost!="
,
expectedIDs
:
util
.
NewStringSet
(
"bar"
),
expectedIDs
:
util
.
NewStringSet
(
"bar"
),
},
},
}
}
...
...
pkg/registry/pod/rest.go
View file @
916ca9cc
...
@@ -132,8 +132,8 @@ func MatchPod(label, field labels.Selector) generic.Matcher {
...
@@ -132,8 +132,8 @@ func MatchPod(label, field labels.Selector) generic.Matcher {
func
PodToSelectableFields
(
pod
*
api
.
Pod
)
labels
.
Set
{
func
PodToSelectableFields
(
pod
*
api
.
Pod
)
labels
.
Set
{
return
labels
.
Set
{
return
labels
.
Set
{
"name"
:
pod
.
Name
,
"name"
:
pod
.
Name
,
"
Status.P
hase"
:
string
(
pod
.
Status
.
Phase
),
"
status.p
hase"
:
string
(
pod
.
Status
.
Phase
),
"
Status.H
ost"
:
pod
.
Status
.
Host
,
"
status.h
ost"
:
pod
.
Status
.
Host
,
}
}
}
}
...
...
plugin/pkg/scheduler/factory/factory.go
View file @
916ca9cc
...
@@ -259,7 +259,7 @@ func getHostFieldLabel(apiVersion string) string {
...
@@ -259,7 +259,7 @@ func getHostFieldLabel(apiVersion string) string {
case
"v1beta1"
,
"v1beta2"
:
case
"v1beta1"
,
"v1beta2"
:
return
"DesiredState.Host"
return
"DesiredState.Host"
default
:
default
:
return
"
Status.H
ost"
return
"
status.h
ost"
}
}
}
}
...
...
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