diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index bfa0633..9854bd8 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-02-18T00:54:04Z" - build_hash: 66c0f840b0bcf6f552be46cf5ee0fb95ad57053e - go_version: go1.23.6 - version: v0.43.0 -api_directory_checksum: 1ef7595c70d504b08f54fe5c2a16eabf46999aea + build_date: "2025-02-19T23:18:34Z" + build_hash: 8b426c490ff1984d8ce5577e11d6dabe1b6373b8 + go_version: go1.24.0 + version: v0.43.1 +api_directory_checksum: 18f4ce08c6d885a2e95716b63874422387df5a0f api_version: v1alpha1 aws_sdk_go_version: v1.32.6 generator_config_info: diff --git a/apis/v1alpha1/rule.go b/apis/v1alpha1/rule.go index 31f2681..898dec9 100644 --- a/apis/v1alpha1/rule.go +++ b/apis/v1alpha1/rule.go @@ -24,8 +24,10 @@ import ( type RuleSpec struct { // The retention rule description. + Description *string `json:"description,omitempty"` // Information about the retention rule lock configuration. + LockConfiguration *LockConfiguration `json:"lockConfiguration,omitempty"` // [Tag-level retention rules only] Specifies the resource tags to use to identify // resources that are to be retained by a tag-level retention rule. For tag-level @@ -42,17 +44,23 @@ type RuleSpec struct { // retention rule does not have any resource tags specified. It retains all // deleted resources of the specified resource type in the Region in which the // rule is created, even if the resources are not tagged. + ResourceTags []*ResourceTag `json:"resourceTags,omitempty"` // The resource type to be retained by the retention rule. Currently, only Amazon // EBS snapshots and EBS-backed AMIs are supported. To retain snapshots, specify // EBS_SNAPSHOT. To retain EBS-backed AMIs, specify EC2_IMAGE. + // +kubebuilder:validation:Required + ResourceType *string `json:"resourceType"` // Information about the retention period for which the retention rule is to // retain resources. + // +kubebuilder:validation:Required + RetentionPeriod *RetentionPeriod `json:"retentionPeriod"` // Information about the tags to assign to the retention rule. + Tags []*Tag `json:"tags,omitempty"` } @@ -63,7 +71,7 @@ type RuleStatus struct { // constructed ARN for the resource // +kubebuilder:validation:Optional ACKResourceMetadata *ackv1alpha1.ResourceMetadata `json:"ackResourceMetadata"` - // All CRS managed by ACK have a common `Status.Conditions` member that + // All CRs managed by ACK have a common `Status.Conditions` member that // contains a collection of `ackv1alpha1.Condition` objects that describe // the various terminal states of the CR and its backend AWS service API // resource diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index d876e6f..4db4ec9 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/recyclebin-controller - newTag: 1.0.4 + newTag: 1.0.5 diff --git a/config/crd/bases/recyclebin.services.k8s.aws_rules.yaml b/config/crd/bases/recyclebin.services.k8s.aws_rules.yaml index 95cf2c0..fbad787 100644 --- a/config/crd/bases/recyclebin.services.k8s.aws_rules.yaml +++ b/config/crd/bases/recyclebin.services.k8s.aws_rules.yaml @@ -40,10 +40,9 @@ spec: description: RuleSpec defines the desired state of Rule. properties: description: - description: The retention rule description. type: string lockConfiguration: - description: Information about the retention rule lock configuration. + description: Information about a retention rule lock configuration. properties: unlockDelay: description: |- @@ -60,22 +59,6 @@ spec: type: object type: object resourceTags: - description: |- - [Tag-level retention rules only] Specifies the resource tags to use to identify - resources that are to be retained by a tag-level retention rule. For tag-level - retention rules, only deleted resources, of the specified resource type, - that have one or more of the specified tag key and value pairs are retained. - If a resource is deleted, but it does not have any of the specified tag key - and value pairs, it is immediately deleted without being retained by the - retention rule. - - You can add the same tag key and value pair to a maximum or five retention - rules. - - To create a Region-level retention rule, omit this parameter. A Region-level - retention rule does not have any resource tags specified. It retains all - deleted resources of the specified resource type in the Region in which the - rule is created, even if the resources are not tagged. items: description: |- [Tag-level retention rules only] Information about the resource tags used @@ -88,10 +71,6 @@ spec: type: object type: array resourceType: - description: |- - The resource type to be retained by the retention rule. Currently, only Amazon - EBS snapshots and EBS-backed AMIs are supported. To retain snapshots, specify - EBS_SNAPSHOT. To retain EBS-backed AMIs, specify EC2_IMAGE. type: string retentionPeriod: description: |- @@ -105,8 +84,6 @@ spec: type: integer type: object tags: - description: Information about the tags to assign to the retention - rule. items: description: Information about the tags to assign to the retention rule. @@ -155,7 +132,7 @@ spec: type: object conditions: description: |- - All CRS managed by ACK have a common `Status.Conditions` member that + All CRs managed by ACK have a common `Status.Conditions` member that contains a collection of `ackv1alpha1.Condition` objects that describe the various terminal states of the CR and its backend AWS service API resource diff --git a/helm/Chart.yaml b/helm/Chart.yaml index a559469..fcd1bf4 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: recyclebin-chart description: A Helm chart for the ACK service controller for Amazon EBS Recycle Bin (Recycle Bin) -version: 1.0.4 -appVersion: 1.0.4 +version: 1.0.5 +appVersion: 1.0.5 home: https://github.com/aws-controllers-k8s/recyclebin-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/crds/recyclebin.services.k8s.aws_rules.yaml b/helm/crds/recyclebin.services.k8s.aws_rules.yaml index 95cf2c0..fbad787 100644 --- a/helm/crds/recyclebin.services.k8s.aws_rules.yaml +++ b/helm/crds/recyclebin.services.k8s.aws_rules.yaml @@ -40,10 +40,9 @@ spec: description: RuleSpec defines the desired state of Rule. properties: description: - description: The retention rule description. type: string lockConfiguration: - description: Information about the retention rule lock configuration. + description: Information about a retention rule lock configuration. properties: unlockDelay: description: |- @@ -60,22 +59,6 @@ spec: type: object type: object resourceTags: - description: |- - [Tag-level retention rules only] Specifies the resource tags to use to identify - resources that are to be retained by a tag-level retention rule. For tag-level - retention rules, only deleted resources, of the specified resource type, - that have one or more of the specified tag key and value pairs are retained. - If a resource is deleted, but it does not have any of the specified tag key - and value pairs, it is immediately deleted without being retained by the - retention rule. - - You can add the same tag key and value pair to a maximum or five retention - rules. - - To create a Region-level retention rule, omit this parameter. A Region-level - retention rule does not have any resource tags specified. It retains all - deleted resources of the specified resource type in the Region in which the - rule is created, even if the resources are not tagged. items: description: |- [Tag-level retention rules only] Information about the resource tags used @@ -88,10 +71,6 @@ spec: type: object type: array resourceType: - description: |- - The resource type to be retained by the retention rule. Currently, only Amazon - EBS snapshots and EBS-backed AMIs are supported. To retain snapshots, specify - EBS_SNAPSHOT. To retain EBS-backed AMIs, specify EC2_IMAGE. type: string retentionPeriod: description: |- @@ -105,8 +84,6 @@ spec: type: integer type: object tags: - description: Information about the tags to assign to the retention - rule. items: description: Information about the tags to assign to the retention rule. @@ -155,7 +132,7 @@ spec: type: object conditions: description: |- - All CRS managed by ACK have a common `Status.Conditions` member that + All CRs managed by ACK have a common `Status.Conditions` member that contains a collection of `ackv1alpha1.Condition` objects that describe the various terminal states of the CR and its backend AWS service API resource diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index f8965ab..65aa961 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/recyclebin-controller:1.0.4". +This chart deploys "public.ecr.aws/aws-controllers-k8s/recyclebin-controller:1.0.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 173841c..eee1a3b 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/recyclebin-controller - tag: 1.0.4 + tag: 1.0.5 pullPolicy: IfNotPresent pullSecrets: []