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
df123865
Commit
df123865
authored
Nov 16, 2016
by
Adam Reese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(kube): fix incomplete patches generated on update
parent
62df1ad3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
client.go
pkg/kube/client.go
+3
-6
No files found.
pkg/kube/client.go
View file @
df123865
...
@@ -28,10 +28,9 @@ import (
...
@@ -28,10 +28,9 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apimachinery/registered"
"k8s.io/kubernetes/pkg/apimachinery/registered"
"k8s.io/kubernetes/pkg/apis/batch"
"k8s.io/kubernetes/pkg/apis/batch"
unversionedclient
"k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
...
@@ -83,7 +82,7 @@ func (e ErrAlreadyExists) Error() string {
...
@@ -83,7 +82,7 @@ func (e ErrAlreadyExists) Error() string {
// means it can't satisfy an interface's method requirement. In order to ensure
// means it can't satisfy an interface's method requirement. In order to ensure
// that an implementation of environment.KubeClient can access the raw API client,
// that an implementation of environment.KubeClient can access the raw API client,
// it is necessary to add this method.
// it is necessary to add this method.
func
(
c
*
Client
)
APIClient
()
(
unversioned
client
.
Interface
,
error
)
{
func
(
c
*
Client
)
APIClient
()
(
unversioned
.
Interface
,
error
)
{
return
c
.
Client
()
return
c
.
Client
()
}
}
...
@@ -431,9 +430,7 @@ func deleteUnwantedResources(currentInfos, targetInfos []*resource.Info) {
...
@@ -431,9 +430,7 @@ func deleteUnwantedResources(currentInfos, targetInfos []*resource.Info) {
func
getCurrentObject
(
target
*
resource
.
Info
,
infos
[]
*
resource
.
Info
)
(
runtime
.
Object
,
error
)
{
func
getCurrentObject
(
target
*
resource
.
Info
,
infos
[]
*
resource
.
Info
)
(
runtime
.
Object
,
error
)
{
if
found
,
ok
:=
findMatchingInfo
(
target
,
infos
);
ok
{
if
found
,
ok
:=
findMatchingInfo
(
target
,
infos
);
ok
{
encoder
:=
api
.
Codecs
.
LegacyCodec
(
registered
.
EnabledVersions
()
...
)
return
found
.
Mapping
.
ConvertToVersion
(
found
.
Object
,
found
.
Mapping
.
GroupVersionKind
.
GroupVersion
())
defaultVersion
:=
unversioned
.
GroupVersion
{}
return
resource
.
AsVersionedObject
([]
*
resource
.
Info
{
found
},
false
,
defaultVersion
,
encoder
)
}
}
return
nil
,
fmt
.
Errorf
(
"No resource with the name %s found."
,
target
.
Name
)
return
nil
,
fmt
.
Errorf
(
"No resource with the name %s found."
,
target
.
Name
)
}
}
...
...
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