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.

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

增加集群和命名空间级别自定义注解 #274

Merged
merged 13 commits into from Feb 18, 2019

Conversation

Projects
None yet
3 participants
@iyacontrol
Copy link
Contributor

iyacontrol commented Feb 15, 2019

What type of PR is this?

/kind feature

What this PR does / why we need it:
to use wayne in public cloud env.

iyacontrol added some commits Feb 15, 2019

@iyacontrol iyacontrol closed this Feb 15, 2019

@iyacontrol iyacontrol reopened this Feb 15, 2019

@iyacontrol iyacontrol closed this Feb 15, 2019

@iyacontrol iyacontrol reopened this Feb 15, 2019

Show resolved Hide resolved src/backend/models/namespace.go Outdated
Show resolved Hide resolved src/backend/controllers/common/deployment.go Outdated

iyacontrol added some commits Feb 15, 2019

@iyacontrol

This comment has been minimized.

Copy link
Contributor Author

iyacontrol commented Feb 15, 2019

iyacontrol and others added some commits Feb 15, 2019

preDefinedAnnotationMap[k] = v
}
// cluster defined, overwrite user defined
for k, v := range cluster.MetaDataObj.ServiceAnnotations {

This comment has been minimized.

@wilhelmguo

wilhelmguo Feb 18, 2019

Collaborator

ingress 为什么引用 ServiceAnnotations ?

This comment has been minimized.

@iyacontrol

iyacontrol Feb 18, 2019

Author Contributor

fix it

wilhelmguo and others added some commits Feb 18, 2019

@wilhelmguo

This comment has been minimized.

Copy link
Collaborator

wilhelmguo commented Feb 18, 2019

@wilhelmguo wilhelmguo merged commit a05c23f into Qihoo360:master Feb 18, 2019

1 of 2 checks passed

Codacy/PR Quality Review Not up to standards. This pull request quality could be better.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.