From 0ee855d49a3ae639c8237ba639f2f4681a879511 Mon Sep 17 00:00:00 2001
From: Thirumalesh Aaraveti <athiruma@redhat.com>
Date: Fri, 4 Oct 2024 17:36:38 +0530
Subject: [PATCH] Added the AWS Capacity Reservation Webhook
---
pkg/webhooks/machine_webhook.go | 20 +++++++++++++
pkg/webhooks/machine_webhook_test.go | 42 ++++++++++++++++++++++++++++
2 files changed, 62 insertions(+)
diff --git a/pkg/webhooks/machine_webhook.go b/pkg/webhooks/machine_webhook.go
index ae7eaf0f9..f60bf8673 100644
--- a/pkg/webhooks/machine_webhook.go
+++ b/pkg/webhooks/machine_webhook.go
@@ -3,6 +3,7 @@ package webhooks
import (
"context"
"encoding/json"
+ "errors"
"fmt"
"regexp"
goruntime "runtime"
@@ -729,6 +730,12 @@ func validateAWS(m *machinev1beta1.Machine, config *admissionConfig) (bool, []st
warnings = append(warnings, "providerSpec.iamInstanceProfile: no IAM instance profile provided: nodes may be unable to join the cluster")
}
+ if providerSpec.CapacityReservationID != "" {
+ if err := validateAwsCapacityReservationId(providerSpec.CapacityReservationID); err != nil {
+ errs = append(errs, field.Invalid(field.NewPath("providerSpec", "capacityReservationId"), providerSpec.CapacityReservationID, err.Error()))
+ }
+ }
+
// TODO(alberto): Validate providerSpec.BlockDevices.
// https://github.com/openshift/cluster-api-provider-aws/pull/299#discussion_r433920532
@@ -2269,3 +2276,16 @@ func appendNextAzureResourceIDValidation(parts []string, id string) error {
}
return fmt.Errorf("invalid resource ID: %s", id)
}
+
+// validateAWScapacityReservationId validate capacity reservation group ID.
+func validateAwsCapacityReservationId(capacityReservationId string) error {
+ if len(capacityReservationId) == 0 {
+ return errors.New("invalid capacityReservationId: capacityReservationId cannot be empty")
+ }
+ // It must starts with cr-xxxxxxxxxxxxxxxxx with length of 17 characters excluding cr-
+ re := regexp.MustCompile(`^cr-[0-9a-f]{17}$`)
+ if !re.MatchString(capacityReservationId) {
+ return fmt.Errorf("invalid value for capacityReservationId: %q, it must start with 'cr-' and be exactly 20 characters long with 17 hexadecimal characters", capacityReservationId)
+ }
+ return nil
+}
diff --git a/pkg/webhooks/machine_webhook_test.go b/pkg/webhooks/machine_webhook_test.go
index 72d17602c..b946e9f2b 100644
--- a/pkg/webhooks/machine_webhook_test.go
+++ b/pkg/webhooks/machine_webhook_test.go
@@ -152,6 +152,48 @@ func TestMachineCreation(t *testing.T) {
},
expectedError: "",
},
+ {
+ name: "with AWS and CapacityReservationID is empty",
+ platformType: osconfigv1.AWSPlatformType,
+ clusterID: "aws-cluster",
+ providerSpecValue: &kruntime.RawExtension{
+ Object: &machinev1beta1.AWSMachineProviderConfig{
+ AMI: machinev1beta1.AWSResourceReference{
+ ID: ptr.To[string]("ami"),
+ },
+ CapacityReservationID: "",
+ },
+ },
+ expectedError: "",
+ },
+ {
+ name: "with AWS and CapacityReservationID is valid",
+ platformType: osconfigv1.AWSPlatformType,
+ clusterID: "aws-cluster",
+ providerSpecValue: &kruntime.RawExtension{
+ Object: &machinev1beta1.AWSMachineProviderConfig{
+ AMI: machinev1beta1.AWSResourceReference{
+ ID: ptr.To[string]("ami"),
+ },
+ CapacityReservationID: "cr-12345678901234567",
+ },
+ },
+ expectedError: "",
+ },
+ {
+ name: "with AWS and CapacityReservationID is not valid",
+ platformType: osconfigv1.AWSPlatformType,
+ clusterID: "aws-cluster",
+ providerSpecValue: &kruntime.RawExtension{
+ Object: &machinev1beta1.AWSMachineProviderConfig{
+ AMI: machinev1beta1.AWSResourceReference{
+ ID: ptr.To[string]("ami"),
+ },
+ CapacityReservationID: "cr-123",
+ },
+ },
+ expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: providerSpec.capacityReservationId: Invalid value: \"cr-123\": invalid value for capacityReservationId: \"cr-123\", it must start with 'cr-' and be exactly 20 characters long with 17 hexadecimal characters",
+ },
{
name: "with Azure and a nil provider spec value",
platformType: osconfigv1.AzurePlatformType,
--
GitLab