Merge pull request kubernetes#101818 from nilo19/automated-cherry-pic…

…k-of-#101752-upstream-release-1.20 Cherry pick of kubernetes#101752: fix: not tagging static public IP
openshift · May 8, 2021 · cc8a07f · cc8a07f
2 parents 6c9e3d8 + 7cfe069
commit cc8a07f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go
@@ -2254,9 +2254,11 @@ func (az *Cloud) reconcilePublicIP(clusterName string, service *v1.Service, lbNa
 				}
 				dirtyPIP = true
 			}
-			changed := az.ensurePIPTagged(service, &pip)
-			if changed {
-				dirtyPIP = true
+			if !isUserAssignedPIP {
+				changed := az.ensurePIPTagged(service, &pip)
+				if changed {
+					dirtyPIP = true
+				}
 			}
 			if shouldReleaseExistingOwnedPublicIP(&pip, wantLb, isInternal, isUserAssignedPIP, desiredPipName, serviceIPTagRequest) {
 				// Then, release the public ip