Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix ingress service bug
  • Loading branch information
iyacontrol committed Feb 18, 2019
commit 212bca8072fc4ce9640cb577aa9dc3732df2d3cf
4 changes: 2 additions & 2 deletions src/backend/controllers/common/ingress.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ func IngressPreDeploy(kubeIngress *kapiv1beta1.Ingress, cluster *models.Cluster,
preDefinedAnnotationMap[k] = v
}
// cluster defined, overwrite user defined
for k, v := range cluster.MetaDataObj.ServiceAnnotations {
for k, v := range cluster.MetaDataObj.IngressAnnotations {
preDefinedAnnotationMap[k] = v
}
// namespace defined, overwrite cluster and user defined
for k, v := range namespace.MetaDataObj.ServiceAnnotations {
for k, v := range namespace.MetaDataObj.IngressAnnotations {
preDefinedAnnotationMap[k] = v
}
for k, v := range preDefinedAnnotationMap {
Expand Down