Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix patch, namespace #33

Merged
merged 1 commit into from
Dec 29, 2017
Merged

Fix patch, namespace #33

merged 1 commit into from
Dec 29, 2017

Conversation

StrongMonkey
Copy link

No description provided.

@StrongMonkey StrongMonkey changed the title don't set finalize on namespace WIP: don't set finalize on namespace Dec 27, 2017
@StrongMonkey StrongMonkey changed the title WIP: don't set finalize on namespace don't set finalize on namespace Dec 27, 2017
@StrongMonkey StrongMonkey force-pushed the fix-namespace branch 2 times, most recently from c4e428e to 406550e Compare December 28, 2017 00:14
@StrongMonkey StrongMonkey changed the title don't set finalize on namespace WIP: don't set finalize on namespace Dec 28, 2017
@StrongMonkey StrongMonkey changed the title WIP: don't set finalize on namespace Don't set finalize on namespace Dec 29, 2017
ibuildthecloud
ibuildthecloud reviewed Dec 29, 2017
View reviewed changes
store/proxy/proxy_store.go Outdated
}).
Name(id)
Name(id).
SetHeader("Content-Type", "application/strategic-merge-patch+json")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use constant

ibuildthecloud
ibuildthecloud reviewed Dec 29, 2017
View reviewed changes
types/mapper/annotation_field.go Outdated
@@ -37,8 +38,17 @@ func (e AnnotationField) ToInternal(data map[string]interface{}) {
v = string(bytes)
}
}
values.PutValue(data, v, "annotations", "field.cattle.io/"+e.Field)
switch v.(type) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switch to convert.ToString(v)

@ibuildthecloud
Copy link
Contributor

And squash

@StrongMonkey StrongMonkey changed the title Don't set finalize on namespace Fix patch, namespace Dec 29, 2017
@ibuildthecloud ibuildthecloud merged commit 0268376 into rancher:master Dec 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ibuildthecloud ibuildthecloud ibuildthecloud left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@StrongMonkey @ibuildthecloud