github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104705 from nilo19/bug/ensure-pip-tagged

Browse Source 
fix: ignore the case when comparing azure tags in service annotation
This commit is contained in:
Kubernetes Prow Robot 2021-09-02 23:05:49 -07:00 committed by GitHub
commit 8d43aa6cbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go
View File

@ -2137,9 +2137,8 @@ func (az *Cloud) ensurePIPTagged(service *v1.Service, pip *network.PublicIPAddre
if _, ok := service.Annotations[ServiceAnnotationAzurePIPTags]; ok { if _, ok := service.Annotations[ServiceAnnotationAzurePIPTags]; ok {
annotationTags = parseTags(service.Annotations[ServiceAnnotationAzurePIPTags]) annotationTags = parseTags(service.Annotations[ServiceAnnotationAzurePIPTags])
} }
for k, v := range annotationTags { configTags, _ = reconcileTags(configTags, annotationTags)
configTags[k] = v
}
// include the cluster name and service names tags when comparing // include the cluster name and service names tags when comparing
var clusterName, serviceNames *string var clusterName, serviceNames *string
if v, ok := pip.Tags[clusterNameKey]; ok { if v, ok := pip.Tags[clusterNameKey]; ok {