Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
H
helm3
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
helm3
Commits
7086a16e
Unverified
Commit
7086a16e
authored
Jan 27, 2018
by
Reinhard Nägele
Committed by
Matthew Fisher
Feb 08, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix 'getSelectorFromObject'
(cherry picked from commit
ea520afd
)
parent
d6dc3ded
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
6 deletions
+31
-6
client.go
pkg/kube/client.go
+31
-6
No files found.
pkg/kube/client.go
View file @
7086a16e
...
@@ -27,10 +27,12 @@ import (
...
@@ -27,10 +27,12 @@ import (
"time"
"time"
jsonpatch
"github.com/evanphx/json-patch"
jsonpatch
"github.com/evanphx/json-patch"
apps
"k8s.io/api/apps/v1beta2"
appsv1
"k8s.io/api/apps/v1"
appsv1beta1
"k8s.io/api/apps/v1beta1"
appsv1beta2
"k8s.io/api/apps/v1beta2"
batch
"k8s.io/api/batch/v1"
batch
"k8s.io/api/batch/v1"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
"k8s.io/api/extensions/v1beta1"
extv1beta1
"k8s.io/api/extensions/v1beta1"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/meta"
...
@@ -507,18 +509,41 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object,
...
@@ -507,18 +509,41 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object,
func
getSelectorFromObject
(
obj
runtime
.
Object
)
(
map
[
string
]
string
,
error
)
{
func
getSelectorFromObject
(
obj
runtime
.
Object
)
(
map
[
string
]
string
,
error
)
{
switch
typed
:=
obj
.
(
type
)
{
switch
typed
:=
obj
.
(
type
)
{
case
*
v1
.
ReplicationController
:
case
*
v1
.
ReplicationController
:
return
typed
.
Spec
.
Selector
,
nil
return
typed
.
Spec
.
Selector
,
nil
case
*
v1beta1
.
ReplicaSet
:
case
*
extv1beta1
.
ReplicaSet
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
appsv1
.
ReplicaSet
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
extv1beta1
.
Deployment
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
appsv1beta1
.
Deployment
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
v1beta1
.
Deployment
:
case
*
appsv1beta2
.
Deployment
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
v1beta1
.
DaemonSet
:
case
*
appsv1
.
Deployment
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
extv1beta1
.
DaemonSet
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
appsv1beta2
.
DaemonSet
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
appsv1
.
DaemonSet
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
batch
.
Job
:
case
*
batch
.
Job
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
apps
.
StatefulSet
:
case
*
appsv1beta1
.
StatefulSet
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
appsv1beta2
.
StatefulSet
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
case
*
appsv1
.
StatefulSet
:
return
typed
.
Spec
.
Selector
.
MatchLabels
,
nil
default
:
default
:
return
nil
,
fmt
.
Errorf
(
"Unsupported kind when getting selector: %v"
,
obj
)
return
nil
,
fmt
.
Errorf
(
"Unsupported kind when getting selector: %v"
,
obj
)
}
}
...
...
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