Merge pull request #1452 from Nordix/lentzi90/port_value_specs_gophercloud

✨ Support value specs for Ports

Author: k8s-ci-robot

api/v1alpha4/conversion_test.go

@@ -308,6 +308,7 @@ func TestFuzzyConversion(t *testing.T) {
 					}
 				}
 				v1alpha6PortOpts.SecurityGroupFilters = nil
+				v1alpha6PortOpts.ValueSpecs = nil
 			},
 			func(v1alpha6FixedIP *infrav1.FixedIP, c fuzz.Continue) {
 				c.FuzzNoCustom(v1alpha6FixedIP)

api/v1alpha4/zz_generated.conversion.go

@@ -207,6 +207,11 @@ func Convert_v1alpha6_LoadBalancer_To_v1alpha5_LoadBalancer(in *infrav1.LoadBala
 	return autoConvert_v1alpha6_LoadBalancer_To_v1alpha5_LoadBalancer(in, out, s)
 }
 
+func Convert_v1alpha6_PortOpts_To_v1alpha5_PortOpts(in *infrav1.PortOpts, out *PortOpts, s conversion.Scope) error {
+	// value specs have been added in v1alpha6 but have no equivalent in v1apha5
+	return autoConvert_v1alpha6_PortOpts_To_v1alpha5_PortOpts(in, out, s)
+}
+
 func Convert_Slice_v1alpha5_Network_To_Slice_v1alpha6_Network(in *[]Network, out *[]infrav1.Network, s conversion.Scope) error {
 	*out = make([]infrav1.Network, len(*in))
 	for i := range *in {

api/v1alpha5/conversion.go

@@ -145,6 +145,14 @@ type PortOpts struct {
 	// These tags are applied in addition to the instance's tags, which will also be applied to the port.
 	// +listType=set
 	Tags []string `json:"tags,omitempty"`
+
+	// Value specs are extra parameters to include in the API request with OpenStack.
+	// This is an extension point for the API, so what they do and if they are supported,
+	// depends on the specific OpenStack implementation.
+	// +optional
+	// +listType=map
+	// +listMapKey=name
+	ValueSpecs []ValueSpec `json:"valueSpecs,omitempty"`
 }
 
 type FixedIP struct {
@@ -316,3 +324,17 @@ type APIServerLoadBalancer struct {
 	// AllowedCIDRs restrict access to all API-Server listeners to the given address CIDRs.
 	AllowedCIDRs []string `json:"allowedCidrs,omitempty"`
 }
+
+// ValueSpec represents a single value_spec key-value pair.
+type ValueSpec struct {
+	// Name is the name of the key-value pair.
+	// This is just for identifying the pair and will not be sent to the OpenStack API.
+	// +kubebuilder:validation:Required
+	Name string `json:"name"`
+	// Key is the key in the key-value pair.
+	// +kubebuilder:validation:Required
+	Key string `json:"key"`
+	// Value is the value in the key-value pair.
+	// +kubebuilder:validation:Required
+	Value string `json:"value"`
+}