diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 9ee83840..d60a90be 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,9 +1,9 @@ ack_generate_info: - build_date: "2025-05-13T17:53:20Z" - build_hash: 55bf57b2806c33a7fcd074be403f26ce3f8e58db + build_date: "2025-05-24T00:20:12Z" + build_hash: 66a58d259146834e61b211a9a01609beaa58ef77 go_version: go1.24.2 - version: v0.46.2 -api_directory_checksum: 3df6921566512e42abdabd564c80aea5311d410a + version: v0.47.1 +api_directory_checksum: d162a6e9df2d4861d6c01d42047402b51f341293 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 generator_config_info: diff --git a/apis/v1alpha1/capacity_reservation.go b/apis/v1alpha1/capacity_reservation.go index 0f52ffd7..5098a7b2 100644 --- a/apis/v1alpha1/capacity_reservation.go +++ b/apis/v1alpha1/capacity_reservation.go @@ -130,6 +130,8 @@ type CapacityReservationSpec struct { // // The Amazon Resource Name (ARN) of the Outpost on which to create the Capacity // Reservation. + // + // Regex Pattern: `^arn:aws([a-z-]+)?:outposts:[a-z\d-]+:\d{12}:outpost/op-[a-f0-9]{17}$` OutpostARN *string `json:"outpostARN,omitempty"` // Not supported for future-dated Capacity Reservations. // @@ -137,6 +139,8 @@ type CapacityReservationSpec struct { // create the Capacity Reservation. For more information, see Capacity Reservations // for cluster placement groups (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/cr-cpg.html) // in the Amazon EC2 User Guide. + // + // Regex Pattern: `^arn:aws([a-z-]+)?:ec2:[a-z\d-]+:\d{12}:placement-group/^.{1,255}$` PlacementGroupARN *string `json:"placementGroupARN,omitempty"` // Required for future-dated Capacity Reservations only. To create a Capacity // Reservation for immediate use, omit this parameter. @@ -245,6 +249,8 @@ type CapacityReservationStatus struct { TotalInstanceCount *int64 `json:"totalInstanceCount,omitempty"` // The ID of the Amazon Web Services account to which billing of the unused // capacity of the Capacity Reservation is assigned. + // + // Regex Pattern: `^[0-9]{12}$` // +kubebuilder:validation:Optional UnusedReservationBillingOwnerID *string `json:"unusedReservationBillingOwnerID,omitempty"` } diff --git a/apis/v1alpha1/launch_template.go b/apis/v1alpha1/launch_template.go index 335bed0d..22ae8274 100644 --- a/apis/v1alpha1/launch_template.go +++ b/apis/v1alpha1/launch_template.go @@ -31,6 +31,8 @@ type LaunchTemplateSpec struct { // The version number of the default version of the launch template. DefaultVersion *int64 `json:"defaultVersion,omitempty"` // A name for the launch template. + // + // Regex Pattern: `^[a-zA-Z0-9\(\)\.\-/_]+$` // +kubebuilder:validation:Required Name *string `json:"name"` // The tags. The value parameter is required, but if you don't want the tag diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 5aabaaee..9e92a692 100644 --- a/config/controller/kustomization.yaml +++ b/config/controller/kustomization.yaml @@ -6,4 +6,4 @@ kind: Kustomization images: - name: controller newName: public.ecr.aws/aws-controllers-k8s/ec2-controller - newTag: 1.4.4 + newTag: 1.4.5 diff --git a/config/crd/bases/ec2.services.k8s.aws_capacityreservations.yaml b/config/crd/bases/ec2.services.k8s.aws_capacityreservations.yaml index c9eaf1c5..5ac7de8a 100644 --- a/config/crd/bases/ec2.services.k8s.aws_capacityreservations.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_capacityreservations.yaml @@ -183,6 +183,8 @@ spec: The Amazon Resource Name (ARN) of the Outpost on which to create the Capacity Reservation. + + Regex Pattern: `^arn:aws([a-z-]+)?:outposts:[a-z\d-]+:\d{12}:outpost/op-[a-f0-9]{17}$` type: string placementGroupARN: description: |- @@ -192,6 +194,8 @@ spec: create the Capacity Reservation. For more information, see Capacity Reservations for cluster placement groups (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/cr-cpg.html) in the Amazon EC2 User Guide. + + Regex Pattern: `^arn:aws([a-z-]+)?:ec2:[a-z\d-]+:\d{12}:placement-group/^.{1,255}$` type: string startDate: description: |- @@ -401,6 +405,8 @@ spec: description: |- The ID of the Amazon Web Services account to which billing of the unused capacity of the Capacity Reservation is assigned. + + Regex Pattern: `^[0-9]{12}$` type: string type: object type: object diff --git a/config/crd/bases/ec2.services.k8s.aws_launchtemplates.yaml b/config/crd/bases/ec2.services.k8s.aws_launchtemplates.yaml index e7702322..a2de372d 100644 --- a/config/crd/bases/ec2.services.k8s.aws_launchtemplates.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_launchtemplates.yaml @@ -609,7 +609,10 @@ spec: format: int64 type: integer name: - description: A name for the launch template. + description: |- + A name for the launch template. + + Regex Pattern: `^[a-zA-Z0-9\(\)\.\-/_]+$` type: string tags: description: |- diff --git a/go.mod b/go.mod index 78bca840..52ab445f 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24.0 toolchain go1.24.1 require ( - github.com/aws-controllers-k8s/runtime v0.46.1 + github.com/aws-controllers-k8s/runtime v0.47.0 github.com/aws/aws-sdk-go v1.49.0 github.com/aws/aws-sdk-go-v2 v1.35.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.202.1 diff --git a/go.sum b/go.sum index df61af6f..052ac3f4 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/aws-controllers-k8s/runtime v0.46.1 h1:61RU6uYiFSp0cDhv52vAmaPzrebzoudtsp1fGkk6iLk= -github.com/aws-controllers-k8s/runtime v0.46.1/go.mod h1:G2UMBKA7qgXG4JV16NTIUp715uqvUEvWaa7TG1I527U= +github.com/aws-controllers-k8s/runtime v0.47.0 h1:pWzMLrwAFrAmMuSukYDLrQp5Yw594w1ke6XWGmI3uyo= +github.com/aws-controllers-k8s/runtime v0.47.0/go.mod h1:G2UMBKA7qgXG4JV16NTIUp715uqvUEvWaa7TG1I527U= github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY= github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.35.0 h1:jTPxEJyzjSuuz0wB+302hr8Eu9KUI+Zv8zlujMGJpVI= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index b2b6ed4f..4fd66437 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: ec2-chart description: A Helm chart for the ACK service controller for Amazon Elastic Cloud Compute (EC2) -version: 1.4.4 -appVersion: 1.4.4 +version: 1.4.5 +appVersion: 1.4.5 home: https://github.com/aws-controllers-k8s/ec2-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/crds/ec2.services.k8s.aws_capacityreservations.yaml b/helm/crds/ec2.services.k8s.aws_capacityreservations.yaml index 60aa3b47..47734eea 100644 --- a/helm/crds/ec2.services.k8s.aws_capacityreservations.yaml +++ b/helm/crds/ec2.services.k8s.aws_capacityreservations.yaml @@ -183,6 +183,8 @@ spec: The Amazon Resource Name (ARN) of the Outpost on which to create the Capacity Reservation. + + Regex Pattern: `^arn:aws([a-z-]+)?:outposts:[a-z\d-]+:\d{12}:outpost/op-[a-f0-9]{17}$` type: string placementGroupARN: description: |- @@ -192,6 +194,8 @@ spec: create the Capacity Reservation. For more information, see Capacity Reservations for cluster placement groups (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/cr-cpg.html) in the Amazon EC2 User Guide. + + Regex Pattern: `^arn:aws([a-z-]+)?:ec2:[a-z\d-]+:\d{12}:placement-group/^.{1,255}$` type: string startDate: description: |- @@ -401,6 +405,8 @@ spec: description: |- The ID of the Amazon Web Services account to which billing of the unused capacity of the Capacity Reservation is assigned. + + Regex Pattern: `^[0-9]{12}$` type: string type: object type: object diff --git a/helm/crds/ec2.services.k8s.aws_launchtemplates.yaml b/helm/crds/ec2.services.k8s.aws_launchtemplates.yaml index e7702322..a2de372d 100644 --- a/helm/crds/ec2.services.k8s.aws_launchtemplates.yaml +++ b/helm/crds/ec2.services.k8s.aws_launchtemplates.yaml @@ -609,7 +609,10 @@ spec: format: int64 type: integer name: - description: A name for the launch template. + description: |- + A name for the launch template. + + Regex Pattern: `^[a-zA-Z0-9\(\)\.\-/_]+$` type: string tags: description: |- diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index f62b6580..8ab4e02d 100644 --- a/helm/templates/NOTES.txt +++ b/helm/templates/NOTES.txt @@ -1,5 +1,5 @@ {{ .Chart.Name }} has been installed. -This chart deploys "public.ecr.aws/aws-controllers-k8s/ec2-controller:1.4.4". +This chart deploys "public.ecr.aws/aws-controllers-k8s/ec2-controller:1.4.5". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/helm/values.yaml b/helm/values.yaml index 181d7be5..eee4f988 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/ec2-controller - tag: 1.4.4 + tag: 1.4.5 pullPolicy: IfNotPresent pullSecrets: []