Merge pull request openshift#1866 from anirudhAgniRedhat/anirudh/Capc…

…ityReservationGroupID CFE-1047: Add the field "CapacityReservationGroupID" to "AzureMachineProviderSpec" in openshift/api
gabemontero · May 21, 2024 · 8af21b7 · 8af21b7
2 parents 101e19d + 57ae3a5
commit 8af21b7
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 28 deletions.
diff --git a/machine/v1beta1/types_azureprovider.go b/machine/v1beta1/types_azureprovider.go
@@ -145,6 +145,13 @@ type AzureMachineProviderSpec struct {
 	// This is useful for debugging software based launch issues.
 	// +optional
 	Diagnostics AzureDiagnostics `json:"diagnostics,omitempty"`
+	// capacityReservationGroupID specifies the capacity reservation group resource id that should be
+	// used for allocating the virtual machine.
+	// The field size should be greater than 0 and the field input must start with '/'.
+	// The input for capacityReservationGroupID must be similar to '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/capacityReservationGroups/{capacityReservationGroupName}'.
+	// The keys which are used should be among 'subscriptions', 'providers' and 'resourcegroups' followed by valid ID or names respectively.
+	// +optional
+	CapacityReservationGroupID string `json:"capacityReservationGroupID,omitempty"`
 }
 
 // SpotVMOptions defines the options relevant to running the Machine on Spot VMs

diff --git a/machine/v1beta1/zz_generated.swagger_doc_generated.go b/machine/v1beta1/zz_generated.swagger_doc_generated.go
diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go
diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -20311,6 +20311,10 @@
           "description": "AvailabilitySet specifies the availability set to use for this instance. Availability set should be precreated, before using this field.",
           "type": "string"
         },
+        "capacityReservationGroupID": {
+          "description": "capacityReservationGroupID specifies the capacity reservation group resource id that should be used for allocating the virtual machine. The field size should be greater than 0 and the field input must start with '/'. The input for capacityReservationGroupID must be similar to '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/capacityReservationGroups/{capacityReservationGroupName}'. The keys which are used should be among 'subscriptions', 'providers' and 'resourcegroups' followed by valid ID or names respectively.",
+          "type": "string"
+        },
         "credentialsSecret": {
           "description": "CredentialsSecret is a reference to the secret with Azure credentials.",
           "$ref": "#/definitions/io.k8s.api.core.v1.SecretReference"