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
0ce78700
Commit
0ce78700
authored
Mar 20, 2018
by
Yongkun Anfernee Gui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix comments and some small fixes
parent
14e3efe2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
10 deletions
+7
-10
element.go
pkg/kubectl/apply/element.go
+7
-10
No files found.
pkg/kubectl/apply/element.go
View file @
0ce78700
...
...
@@ -45,7 +45,7 @@ type Element interface {
GetRecorded
()
interface
{}
// HasLocal returns true if the field was explicitly
// present in the
recorded
source. This is to differentiate between
// present in the
local
source. This is to differentiate between
// undefined and set to null
HasLocal
()
bool
...
...
@@ -88,7 +88,7 @@ type FieldMetaImpl struct {
// Type is the openapi type of the field - "list", "primitive", "map"
Type
string
// Name contains of the field
// Name contains
name
of the field
Name
string
}
...
...
@@ -276,8 +276,7 @@ func (s *CombinedMapSlice) UpsertRecorded(key MergeKeys, l interface{}) error {
if
err
!=
nil
{
return
err
}
item
.
recorded
=
l
item
.
recordedSet
=
true
item
.
SetRecorded
(
l
)
return
nil
}
...
...
@@ -289,8 +288,7 @@ func (s *CombinedMapSlice) UpsertLocal(key MergeKeys, l interface{}) error {
if
err
!=
nil
{
return
err
}
item
.
local
=
l
item
.
localSet
=
true
item
.
SetLocal
(
l
)
return
nil
}
...
...
@@ -302,8 +300,7 @@ func (s *CombinedMapSlice) UpsertRemote(key MergeKeys, l interface{}) error {
if
err
!=
nil
{
return
err
}
item
.
remote
=
l
item
.
remoteSet
=
true
item
.
SetRemote
(
l
)
return
nil
}
...
...
@@ -359,13 +356,13 @@ func (b *RawElementData) SetRecorded(value interface{}) {
b
.
recordedSet
=
true
}
// SetLocal sets the
recorded
value
// SetLocal sets the
local
value
func
(
b
*
RawElementData
)
SetLocal
(
value
interface
{})
{
b
.
local
=
value
b
.
localSet
=
true
}
// SetRemote sets the re
corded
value
// SetRemote sets the re
mote
value
func
(
b
*
RawElementData
)
SetRemote
(
value
interface
{})
{
b
.
remote
=
value
b
.
remoteSet
=
true
...
...
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