Merge pull request #2000 from shiftstack/issue1999

k8s-ci-robot · web-flow · commit 78f7b3f2183b · 2024-04-04T04:36:39.000-07:00
🐛 Rules are optional in security group rules before v1beta1
diff --git a/api/v1alpha5/types.go b/api/v1alpha5/types.go
@@ -241,7 +241,7 @@ type LoadBalancer struct {
 type SecurityGroup struct {
 	Name  string              `json:"name"`
 	ID    string              `json:"id"`
-	Rules []SecurityGroupRule `json:"rules"`
+	Rules []SecurityGroupRule `json:"rules,omitempty"`
 }
 
 // SecurityGroupRule represent the basic information of the associated OpenStack
diff --git a/api/v1alpha6/types.go b/api/v1alpha6/types.go
@@ -253,7 +253,7 @@ type LoadBalancer struct {
 type SecurityGroup struct {
 	Name  string              `json:"name"`
 	ID    string              `json:"id"`
-	Rules []SecurityGroupRule `json:"rules"`
+	Rules []SecurityGroupRule `json:"rules,omitempty"`
 }
 
 // SecurityGroupRule represent the basic information of the associated OpenStack
diff --git a/api/v1alpha7/types.go b/api/v1alpha7/types.go
@@ -281,7 +281,7 @@ type LoadBalancer struct {
 type SecurityGroup struct {
 	Name  string              `json:"name"`
 	ID    string              `json:"id"`
-	Rules []SecurityGroupRule `json:"rules"`
+	Rules []SecurityGroupRule `json:"rules,omitempty"`
 }
 
 // SecurityGroupRule represent the basic information of the associated OpenStack
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ type LoadBalancer struct {`
`241`	`241`	`type SecurityGroup struct {`
`242`	`242`	Name string `json:"name"`
`243`	`243`	ID string `json:"id"`
`244`		- Rules []SecurityGroupRule `json:"rules"`
	`244`	+ Rules []SecurityGroupRule `json:"rules,omitempty"`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`// SecurityGroupRule represent the basic information of the associated OpenStack`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ type LoadBalancer struct {`
`253`	`253`	`type SecurityGroup struct {`
`254`	`254`	Name string `json:"name"`
`255`	`255`	ID string `json:"id"`
`256`		- Rules []SecurityGroupRule `json:"rules"`
	`256`	+ Rules []SecurityGroupRule `json:"rules,omitempty"`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`// SecurityGroupRule represent the basic information of the associated OpenStack`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ type LoadBalancer struct {`
`281`	`281`	`type SecurityGroup struct {`
`282`	`282`	Name string `json:"name"`
`283`	`283`	ID string `json:"id"`
`284`		- Rules []SecurityGroupRule `json:"rules"`
	`284`	+ Rules []SecurityGroupRule `json:"rules,omitempty"`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`// SecurityGroupRule represent the basic information of the associated OpenStack`