Merge pull request #211 from dulek/master

Sync from upstream
openshift · Aug 16, 2023 · 7b52ba5 · 7b52ba5
2 parents dc785bc + 42c95f4
commit 7b52ba5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go
@@ -2156,7 +2156,7 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(ctx context.Context, clusterName string
 
 func compareSecurityGroupRuleAndCreateOpts(rule rules.SecGroupRule, opts rules.CreateOpts) bool {
 	return rule.Direction == string(opts.Direction) &&
-		rule.Protocol == string(opts.Protocol) &&
+		strings.EqualFold(rule.Protocol, string(opts.Protocol)) &&
 		rule.EtherType == string(opts.EtherType) &&
 		rule.RemoteIPPrefix == opts.RemoteIPPrefix &&
 		rule.PortRangeMin == opts.PortRangeMin &&
@@ -2282,10 +2282,11 @@ func (lbaas *LbaasV2) ensureAndUpdateOctaviaSecurityGroup(clusterName string, ap
 			continue
 		}
 		for _, cidr := range cidrs {
+			protocol := strings.ToLower(string(port.Protocol)) // K8s uses TCP, Neutron uses tcp, etc.
 			wantedRules = append(wantedRules,
 				rules.CreateOpts{
 					Direction:      rules.DirIngress,
-					Protocol:       rules.RuleProtocol(port.Protocol),
+					Protocol:       rules.RuleProtocol(protocol),
 					EtherType:      etherType,
 					RemoteIPPrefix: cidr,
 					SecGroupID:     lbSecGroupID,

diff --git a/pkg/openstack/loadbalancer_test.go b/pkg/openstack/loadbalancer_test.go
@@ -207,6 +207,34 @@ func TestGetRulesToCreateAndDelete(t *testing.T) {
 				},
 			},
 		},
+		{
+			testName: "Protocol case mismatch",
+			wantedRules: []rules.CreateOpts{
+				{
+					Direction:      "ingress",
+					EtherType:      "IPv4",
+					SecGroupID:     "foo",
+					PortRangeMax:   123,
+					PortRangeMin:   123,
+					Protocol:       "TCP",
+					RemoteIPPrefix: "10.0.0.0/8",
+				},
+			},
+			existingRules: []rules.SecGroupRule{
+				{
+					ID:             "bar",
+					Direction:      "ingress",
+					EtherType:      "IPv4",
+					SecGroupID:     "foo",
+					PortRangeMax:   123,
+					PortRangeMin:   123,
+					Protocol:       "tcp",
+					RemoteIPPrefix: "10.0.0.0/8",
+				},
+			},
+			toCreate: []rules.CreateOpts{},
+			toDelete: []rules.SecGroupRule{},
+		},
 		{
 			testName: "changing a port number",
 			wantedRules: []rules.CreateOpts{