From 385c77b590634ebc03bdbb0770f3be335d50a098 Mon Sep 17 00:00:00 2001 From: michaelhtm <98621731+michaelhtm@users.noreply.github.com> Date: Mon, 3 Nov 2025 12:10:51 -0800 Subject: [PATCH 1/2] fix: ignore errors when vpc does not have default security groups Currently the controller has been returning an error if the VPC securityGroup is not found. With this change, we will ignore errors if we can't find the security group --- pkg/resource/vpc/hooks.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/resource/vpc/hooks.go b/pkg/resource/vpc/hooks.go index 705f72b4..d759a868 100644 --- a/pkg/resource/vpc/hooks.go +++ b/pkg/resource/vpc/hooks.go @@ -15,7 +15,6 @@ package vpc import ( "context" - "fmt" ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" @@ -383,6 +382,9 @@ func (rm *resourceManager) hasSecurityGroupDefaultRules( if err != nil { return false, err } + if sgID == nil { + return false, nil + } groupIDFilter := "group-id" input := &svcsdk.DescribeSecurityGroupRulesInput{ @@ -472,6 +474,9 @@ func (rm *resourceManager) deleteSecurityGroupDefaultRules( if err != nil { return err } + if sgID == nil { + return nil + } ipRange := svcsdktypes.IpRange{ CidrIp: ptr("0.0.0.0/0"), @@ -560,7 +565,7 @@ func (rm *resourceManager) getDefaultSGId( } if len(resp.SecurityGroups) == 0 { - return nil, fmt.Errorf("default security group not found") + return nil, nil } return resp.SecurityGroups[0].GroupId, nil From 887d501a248d99c2b1c5ba694214624de00587ba Mon Sep 17 00:00:00 2001 From: michaelhtm <98621731+michaelhtm@users.noreply.github.com> Date: Mon, 3 Nov 2025 16:31:50 -0800 Subject: [PATCH 2/2] generate ec2 with latest code-gen --- apis/v1alpha1/ack-generate-metadata.yaml | 10 +++++----- .../ec2.services.k8s.aws_capacityreservations.yaml | 2 +- config/crd/bases/ec2.services.k8s.aws_dhcpoptions.yaml | 2 +- .../bases/ec2.services.k8s.aws_elasticipaddresses.yaml | 2 +- config/crd/bases/ec2.services.k8s.aws_flowlogs.yaml | 2 +- config/crd/bases/ec2.services.k8s.aws_instances.yaml | 2 +- .../bases/ec2.services.k8s.aws_internetgateways.yaml | 2 +- .../bases/ec2.services.k8s.aws_launchtemplates.yaml | 2 +- config/crd/bases/ec2.services.k8s.aws_natgateways.yaml | 2 +- config/crd/bases/ec2.services.k8s.aws_networkacls.yaml | 2 +- config/crd/bases/ec2.services.k8s.aws_routetables.yaml | 2 +- .../crd/bases/ec2.services.k8s.aws_securitygroups.yaml | 2 +- config/crd/bases/ec2.services.k8s.aws_subnets.yaml | 2 +- .../bases/ec2.services.k8s.aws_transitgateways.yaml | 2 +- ....services.k8s.aws_transitgatewayvpcattachments.yaml | 2 +- .../crd/bases/ec2.services.k8s.aws_vpcendpoints.yaml | 2 +- ...vices.k8s.aws_vpcendpointserviceconfigurations.yaml | 2 +- .../ec2.services.k8s.aws_vpcpeeringconnections.yaml | 2 +- config/crd/bases/ec2.services.k8s.aws_vpcs.yaml | 2 +- .../ec2.services.k8s.aws_capacityreservations.yaml | 2 +- helm/crds/ec2.services.k8s.aws_dhcpoptions.yaml | 2 +- helm/crds/ec2.services.k8s.aws_elasticipaddresses.yaml | 2 +- helm/crds/ec2.services.k8s.aws_flowlogs.yaml | 2 +- helm/crds/ec2.services.k8s.aws_instances.yaml | 2 +- helm/crds/ec2.services.k8s.aws_internetgateways.yaml | 2 +- helm/crds/ec2.services.k8s.aws_launchtemplates.yaml | 2 +- helm/crds/ec2.services.k8s.aws_natgateways.yaml | 2 +- helm/crds/ec2.services.k8s.aws_networkacls.yaml | 2 +- helm/crds/ec2.services.k8s.aws_routetables.yaml | 2 +- helm/crds/ec2.services.k8s.aws_securitygroups.yaml | 2 +- helm/crds/ec2.services.k8s.aws_subnets.yaml | 2 +- helm/crds/ec2.services.k8s.aws_transitgateways.yaml | 2 +- ....services.k8s.aws_transitgatewayvpcattachments.yaml | 2 +- helm/crds/ec2.services.k8s.aws_vpcendpoints.yaml | 2 +- ...vices.k8s.aws_vpcendpointserviceconfigurations.yaml | 2 +- .../ec2.services.k8s.aws_vpcpeeringconnections.yaml | 2 +- helm/crds/ec2.services.k8s.aws_vpcs.yaml | 2 +- helm/crds/services.k8s.aws_adoptedresources.yaml | 2 +- helm/crds/services.k8s.aws_fieldexports.yaml | 2 +- pkg/resource/instance/hooks.go | 1 - 40 files changed, 43 insertions(+), 44 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 1de87cc7..445b5cb9 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,13 +1,13 @@ ack_generate_info: - build_date: "2025-09-25T16:19:07Z" - build_hash: 6b4211163dcc34776b01da9a18217bac0f4103fd - go_version: go1.24.6 - version: v0.52.0 + build_date: "2025-11-03T23:59:47Z" + build_hash: eaabefb6bd7b2be8a1baf4478f22b3310e6921c8 + go_version: go1.25.1 + version: v0.52.0-6-geaabefb api_directory_checksum: 5a5c93e3d4865ea08d8a47b2500551112ea831b9 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 generator_config_info: - file_checksum: 6d72b2e7d053535b6f6966348d3ac4e4535052cd + file_checksum: 220d17205c72ce425824ef99e0a79fbfc7c63ef2 original_file_name: generator.yaml last_modification: reason: API generation diff --git a/config/crd/bases/ec2.services.k8s.aws_capacityreservations.yaml b/config/crd/bases/ec2.services.k8s.aws_capacityreservations.yaml index 5ac7de8a..94f7a44c 100644 --- a/config/crd/bases/ec2.services.k8s.aws_capacityreservations.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_capacityreservations.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: capacityreservations.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_dhcpoptions.yaml b/config/crd/bases/ec2.services.k8s.aws_dhcpoptions.yaml index 78466ea8..986e789a 100644 --- a/config/crd/bases/ec2.services.k8s.aws_dhcpoptions.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_dhcpoptions.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: dhcpoptions.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_elasticipaddresses.yaml b/config/crd/bases/ec2.services.k8s.aws_elasticipaddresses.yaml index 558c59d5..d1b2f176 100644 --- a/config/crd/bases/ec2.services.k8s.aws_elasticipaddresses.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_elasticipaddresses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: elasticipaddresses.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_flowlogs.yaml b/config/crd/bases/ec2.services.k8s.aws_flowlogs.yaml index 78bfc4bf..5a6cf9e0 100644 --- a/config/crd/bases/ec2.services.k8s.aws_flowlogs.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_flowlogs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: flowlogs.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_instances.yaml b/config/crd/bases/ec2.services.k8s.aws_instances.yaml index bb2f0aec..7efefd22 100644 --- a/config/crd/bases/ec2.services.k8s.aws_instances.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_instances.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: instances.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_internetgateways.yaml b/config/crd/bases/ec2.services.k8s.aws_internetgateways.yaml index edbaadd9..e67e9037 100644 --- a/config/crd/bases/ec2.services.k8s.aws_internetgateways.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_internetgateways.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: internetgateways.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_launchtemplates.yaml b/config/crd/bases/ec2.services.k8s.aws_launchtemplates.yaml index a2de372d..7db9204c 100644 --- a/config/crd/bases/ec2.services.k8s.aws_launchtemplates.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_launchtemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: launchtemplates.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_natgateways.yaml b/config/crd/bases/ec2.services.k8s.aws_natgateways.yaml index e03ecfbe..43762401 100644 --- a/config/crd/bases/ec2.services.k8s.aws_natgateways.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_natgateways.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: natgateways.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_networkacls.yaml b/config/crd/bases/ec2.services.k8s.aws_networkacls.yaml index 062eaf73..3ac31976 100644 --- a/config/crd/bases/ec2.services.k8s.aws_networkacls.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_networkacls.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: networkacls.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_routetables.yaml b/config/crd/bases/ec2.services.k8s.aws_routetables.yaml index cbbdfc2b..91d2acf7 100644 --- a/config/crd/bases/ec2.services.k8s.aws_routetables.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_routetables.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: routetables.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_securitygroups.yaml b/config/crd/bases/ec2.services.k8s.aws_securitygroups.yaml index be3f1706..57cb581b 100644 --- a/config/crd/bases/ec2.services.k8s.aws_securitygroups.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_securitygroups.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: securitygroups.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_subnets.yaml b/config/crd/bases/ec2.services.k8s.aws_subnets.yaml index 72eba7f1..e301e9ff 100644 --- a/config/crd/bases/ec2.services.k8s.aws_subnets.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_subnets.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: subnets.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_transitgateways.yaml b/config/crd/bases/ec2.services.k8s.aws_transitgateways.yaml index f6671d44..fc9e5a9a 100644 --- a/config/crd/bases/ec2.services.k8s.aws_transitgateways.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_transitgateways.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: transitgateways.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_transitgatewayvpcattachments.yaml b/config/crd/bases/ec2.services.k8s.aws_transitgatewayvpcattachments.yaml index 9d7c4119..a1e6eb3d 100644 --- a/config/crd/bases/ec2.services.k8s.aws_transitgatewayvpcattachments.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_transitgatewayvpcattachments.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: transitgatewayvpcattachments.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_vpcendpoints.yaml b/config/crd/bases/ec2.services.k8s.aws_vpcendpoints.yaml index 52edeea7..13524d3d 100644 --- a/config/crd/bases/ec2.services.k8s.aws_vpcendpoints.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_vpcendpoints.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: vpcendpoints.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_vpcendpointserviceconfigurations.yaml b/config/crd/bases/ec2.services.k8s.aws_vpcendpointserviceconfigurations.yaml index 3a37e101..d4f38e12 100644 --- a/config/crd/bases/ec2.services.k8s.aws_vpcendpointserviceconfigurations.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_vpcendpointserviceconfigurations.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: vpcendpointserviceconfigurations.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_vpcpeeringconnections.yaml b/config/crd/bases/ec2.services.k8s.aws_vpcpeeringconnections.yaml index a7c11a2d..4091a01b 100644 --- a/config/crd/bases/ec2.services.k8s.aws_vpcpeeringconnections.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_vpcpeeringconnections.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: vpcpeeringconnections.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/config/crd/bases/ec2.services.k8s.aws_vpcs.yaml b/config/crd/bases/ec2.services.k8s.aws_vpcs.yaml index 17292af5..1bf66e5f 100644 --- a/config/crd/bases/ec2.services.k8s.aws_vpcs.yaml +++ b/config/crd/bases/ec2.services.k8s.aws_vpcs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: vpcs.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_capacityreservations.yaml b/helm/crds/ec2.services.k8s.aws_capacityreservations.yaml index 47734eea..8feda3df 100644 --- a/helm/crds/ec2.services.k8s.aws_capacityreservations.yaml +++ b/helm/crds/ec2.services.k8s.aws_capacityreservations.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: capacityreservations.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_dhcpoptions.yaml b/helm/crds/ec2.services.k8s.aws_dhcpoptions.yaml index 78466ea8..986e789a 100644 --- a/helm/crds/ec2.services.k8s.aws_dhcpoptions.yaml +++ b/helm/crds/ec2.services.k8s.aws_dhcpoptions.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: dhcpoptions.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_elasticipaddresses.yaml b/helm/crds/ec2.services.k8s.aws_elasticipaddresses.yaml index 558c59d5..d1b2f176 100644 --- a/helm/crds/ec2.services.k8s.aws_elasticipaddresses.yaml +++ b/helm/crds/ec2.services.k8s.aws_elasticipaddresses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: elasticipaddresses.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_flowlogs.yaml b/helm/crds/ec2.services.k8s.aws_flowlogs.yaml index 01d5c36d..0d4ade6b 100644 --- a/helm/crds/ec2.services.k8s.aws_flowlogs.yaml +++ b/helm/crds/ec2.services.k8s.aws_flowlogs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: flowlogs.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_instances.yaml b/helm/crds/ec2.services.k8s.aws_instances.yaml index bb2f0aec..7efefd22 100644 --- a/helm/crds/ec2.services.k8s.aws_instances.yaml +++ b/helm/crds/ec2.services.k8s.aws_instances.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: instances.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_internetgateways.yaml b/helm/crds/ec2.services.k8s.aws_internetgateways.yaml index edbaadd9..e67e9037 100644 --- a/helm/crds/ec2.services.k8s.aws_internetgateways.yaml +++ b/helm/crds/ec2.services.k8s.aws_internetgateways.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: internetgateways.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_launchtemplates.yaml b/helm/crds/ec2.services.k8s.aws_launchtemplates.yaml index a2de372d..7db9204c 100644 --- a/helm/crds/ec2.services.k8s.aws_launchtemplates.yaml +++ b/helm/crds/ec2.services.k8s.aws_launchtemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: launchtemplates.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_natgateways.yaml b/helm/crds/ec2.services.k8s.aws_natgateways.yaml index e03ecfbe..43762401 100644 --- a/helm/crds/ec2.services.k8s.aws_natgateways.yaml +++ b/helm/crds/ec2.services.k8s.aws_natgateways.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: natgateways.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_networkacls.yaml b/helm/crds/ec2.services.k8s.aws_networkacls.yaml index 062eaf73..3ac31976 100644 --- a/helm/crds/ec2.services.k8s.aws_networkacls.yaml +++ b/helm/crds/ec2.services.k8s.aws_networkacls.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: networkacls.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_routetables.yaml b/helm/crds/ec2.services.k8s.aws_routetables.yaml index cbbdfc2b..91d2acf7 100644 --- a/helm/crds/ec2.services.k8s.aws_routetables.yaml +++ b/helm/crds/ec2.services.k8s.aws_routetables.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: routetables.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_securitygroups.yaml b/helm/crds/ec2.services.k8s.aws_securitygroups.yaml index be3f1706..57cb581b 100644 --- a/helm/crds/ec2.services.k8s.aws_securitygroups.yaml +++ b/helm/crds/ec2.services.k8s.aws_securitygroups.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: securitygroups.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_subnets.yaml b/helm/crds/ec2.services.k8s.aws_subnets.yaml index 72eba7f1..e301e9ff 100644 --- a/helm/crds/ec2.services.k8s.aws_subnets.yaml +++ b/helm/crds/ec2.services.k8s.aws_subnets.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: subnets.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_transitgateways.yaml b/helm/crds/ec2.services.k8s.aws_transitgateways.yaml index f6671d44..fc9e5a9a 100644 --- a/helm/crds/ec2.services.k8s.aws_transitgateways.yaml +++ b/helm/crds/ec2.services.k8s.aws_transitgateways.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: transitgateways.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_transitgatewayvpcattachments.yaml b/helm/crds/ec2.services.k8s.aws_transitgatewayvpcattachments.yaml index 9d7c4119..a1e6eb3d 100644 --- a/helm/crds/ec2.services.k8s.aws_transitgatewayvpcattachments.yaml +++ b/helm/crds/ec2.services.k8s.aws_transitgatewayvpcattachments.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: transitgatewayvpcattachments.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_vpcendpoints.yaml b/helm/crds/ec2.services.k8s.aws_vpcendpoints.yaml index 52edeea7..13524d3d 100644 --- a/helm/crds/ec2.services.k8s.aws_vpcendpoints.yaml +++ b/helm/crds/ec2.services.k8s.aws_vpcendpoints.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: vpcendpoints.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_vpcendpointserviceconfigurations.yaml b/helm/crds/ec2.services.k8s.aws_vpcendpointserviceconfigurations.yaml index 3a37e101..d4f38e12 100644 --- a/helm/crds/ec2.services.k8s.aws_vpcendpointserviceconfigurations.yaml +++ b/helm/crds/ec2.services.k8s.aws_vpcendpointserviceconfigurations.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: vpcendpointserviceconfigurations.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_vpcpeeringconnections.yaml b/helm/crds/ec2.services.k8s.aws_vpcpeeringconnections.yaml index a7c11a2d..4091a01b 100644 --- a/helm/crds/ec2.services.k8s.aws_vpcpeeringconnections.yaml +++ b/helm/crds/ec2.services.k8s.aws_vpcpeeringconnections.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: vpcpeeringconnections.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/ec2.services.k8s.aws_vpcs.yaml b/helm/crds/ec2.services.k8s.aws_vpcs.yaml index 17292af5..1bf66e5f 100644 --- a/helm/crds/ec2.services.k8s.aws_vpcs.yaml +++ b/helm/crds/ec2.services.k8s.aws_vpcs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: vpcs.ec2.services.k8s.aws spec: group: ec2.services.k8s.aws diff --git a/helm/crds/services.k8s.aws_adoptedresources.yaml b/helm/crds/services.k8s.aws_adoptedresources.yaml index b7be3224..d6cdd10f 100644 --- a/helm/crds/services.k8s.aws_adoptedresources.yaml +++ b/helm/crds/services.k8s.aws_adoptedresources.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: adoptedresources.services.k8s.aws spec: group: services.k8s.aws diff --git a/helm/crds/services.k8s.aws_fieldexports.yaml b/helm/crds/services.k8s.aws_fieldexports.yaml index 49b4f383..6e2c61e6 100644 --- a/helm/crds/services.k8s.aws_fieldexports.yaml +++ b/helm/crds/services.k8s.aws_fieldexports.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: fieldexports.services.k8s.aws spec: group: services.k8s.aws diff --git a/pkg/resource/instance/hooks.go b/pkg/resource/instance/hooks.go index 0c31deb2..a36414c7 100644 --- a/pkg/resource/instance/hooks.go +++ b/pkg/resource/instance/hooks.go @@ -153,7 +153,6 @@ func needsRestart(ko *v1alpha1.Instance) bool { return *ko.Status.State.Name == string(svcsdktypes.InstanceStateNameTerminated) } - func setAdditionalFields(instance svcsdktypes.Instance, ko *v1alpha1.Instance) { ko.Spec.SecurityGroupIDs = []*string{} for _, group := range instance.SecurityGroups {