Skip to content

K
k3s
Unverified Commit 7839fe38 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #71899 from kubernetes/revert-71484-nsg-srcrange-collapse

Revert "Collapse not shared NSG rules with multiple source ranges"
parents e712ff67 e5f767d6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
pkg/cloudprovider/providers/azure/azure_standard.go
View file @ 7839fe38
...@@ -236,11 +236,6 @@ func (az *Cloud) getSecurityRuleName(service *v1.Service, port v1.ServicePort, s ...@@ -236,11 +236,6 @@ func (az *Cloud) getSecurityRuleName(service *v1.Service, port v1.ServicePort, s
safePrefix := strings.Replace(sourceAddrPrefix, "/", "_", -1) safePrefix := strings.Replace(sourceAddrPrefix, "/", "_", -1)
return fmt.Sprintf("shared-%s-%d-%s", port.Protocol, port.Port, safePrefix) return fmt.Sprintf("shared-%s-%d-%s", port.Protocol, port.Port, safePrefix)
} }
if sourceAddrPrefix == "" {
rulePrefix := az.getRulePrefix(service)
return fmt.Sprintf("%s-%s-%d", rulePrefix, port.Protocol, port.Port)
}
// ensure backward compatibility
safePrefix := strings.Replace(sourceAddrPrefix, "/", "_", -1) safePrefix := strings.Replace(sourceAddrPrefix, "/", "_", -1)
rulePrefix := az.getRulePrefix(service) rulePrefix := az.getRulePrefix(service)
return fmt.Sprintf("%s-%s-%d-%s", rulePrefix, port.Protocol, port.Port, safePrefix) return fmt.Sprintf("%s-%s-%d-%s", rulePrefix, port.Protocol, port.Port, safePrefix)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment