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
Merged

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

merged 13 commits into from
Feb 18, 2019

Conversation

iyacontrol
Copy link
Contributor

What type of PR is this?

/kind feature

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

@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
@wilhelmguo wilhelmguo added the kind/feature Categorizes issue or PR as related to a new feature. label Feb 15, 2019
src/backend/models/namespace.go Outdated Show resolved Hide resolved
src/backend/controllers/common/deployment.go Outdated Show resolved Hide resolved
@iyacontrol
Copy link
Contributor Author

@wilhelmguo @chengyumeng fix it

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

Choose a reason for hiding this comment

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

ingress 为什么引用 ServiceAnnotations ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fix it

@wilhelmguo
Copy link
Collaborator

#243

@wilhelmguo wilhelmguo merged commit a05c23f into Qihoo360:master Feb 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Categorizes issue or PR as related to a new feature.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants