Skip to content

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

Merged
wilhelmguo merged 13 commits into
Qihoo360:masterfrom
iyacontrol:announce
Feb 18, 2019
Merged

增加集群和命名空间级别自定义注解#274
wilhelmguo merged 13 commits into
Qihoo360:masterfrom
iyacontrol:announce

Conversation

@iyacontrol
Copy link
Copy Markdown
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
Comment thread src/backend/controllers/common/ingress.go
Comment thread src/backend/models/namespace.go Outdated
Comment thread src/backend/controllers/common/deployment.go Outdated
@iyacontrol
Copy link
Copy Markdown
Contributor Author

@wilhelmguo @chengyumeng fix it

preDefinedAnnotationMap[k] = v
}
// cluster defined, overwrite user defined
for k, v := range cluster.MetaDataObj.ServiceAnnotations {
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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