Merge pull request #163 from itzikb-redhat/no-remotegroupid

Remove RemoteGroupID from SecurityGroupRule
k-orc · Jan 3, 2025 · 7625aa3 · 7625aa3
2 parents c699338 + 9827d5d
commit 7625aa3
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 33 deletions.
diff --git a/api/v1alpha1/securitygroup_types.go b/api/v1alpha1/securitygroup_types.go
@@ -44,9 +44,6 @@ type SecurityGroupRule struct {
 
 	// RemoteAddressGroupId (Not in gophercloud)
 
-	// RemoteGroupID
-	RemoteGroupID *UUID `json:"remoteGroupID,omitempty"`
-
 	// RemoteIPPrefix
 	RemoteIPPrefix *CIDR `json:"remoteIPPrefix,omitempty"`
 

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/models-schema/zz_generated.openapi.go b/cmd/models-schema/zz_generated.openapi.go
diff --git a/config/crd/bases/openstack.k-orc.cloud_securitygroups.yaml b/config/crd/bases/openstack.k-orc.cloud_securitygroups.yaml
@@ -272,11 +272,6 @@ spec:
                           minLength: 1
                           pattern: \b([01]?[0-9][0-9]?|2[0-4][0-9]|25[0-5])\b|any|ah|dccp|egp|esp|gre|icmp|icmpv6|igmp|ipip|ipv6-encap|ipv6-frag|ipv6-icmp|ipv6-nonxt|ipv6-opts|ipv6-route|ospf|pgm|rsvp|sctp|tcp|udp|udplite|vrrp
                           type: string
-                        remoteGroupID:
-                          description: RemoteGroupID
-                          format: uuid
-                          maxLength: 36
-                          type: string
                         remoteIPPrefix:
                           description: RemoteIPPrefix
                           format: cidr

diff --git a/internal/controllers/securitygroup/actuator.go b/internal/controllers/securitygroup/actuator.go
@@ -145,7 +145,6 @@ func (obj securityGroupActuator) CreateResource(ctx context.Context) ([]generic.
 			SecGroupID:     osResource.ID,
 			Description:    string(ptr.Deref(resource.Rules[i].Description, "")),
 			Direction:      rules.RuleDirection(ptr.Deref(resource.Rules[i].Direction, "")),
-			RemoteGroupID:  string(ptr.Deref(resource.Rules[i].RemoteGroupID, "")),
 			RemoteIPPrefix: string(ptr.Deref(resource.Rules[i].RemoteIPPrefix, "")),
 			Protocol:       rules.RuleProtocol(ptr.Deref(resource.Rules[i].Protocol, "")),
 			EtherType:      rules.RuleEtherType(ptr.Deref(resource.Rules[i].Ethertype, "")),

diff --git a/pkg/clients/applyconfiguration/api/v1alpha1/securitygrouprule.go b/pkg/clients/applyconfiguration/api/v1alpha1/securitygrouprule.go
diff --git a/pkg/clients/applyconfiguration/internal/internal.go b/pkg/clients/applyconfiguration/internal/internal.go