Skip to content

Add support for Security Group Adoption #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 15, 2024
Merged

Add support for Security Group Adoption #165

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0bab55
Fixed adoption of security groups
pcolazurdo Dec 20, 2023
631bde4
Fixed adoption of security groups
pcolazurdo Dec 20, 2023
6ffa1b5
Rebase against 3ac4413514ef474d875bedd42725eebe2015d647
pcolazurdo Jan 8, 2024
5aca0e8
ack-generate with latest code-generator version
pcolazurdo Jan 8, 2024
ae3574b
Added correct tag versioning
pcolazurdo Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2024-01-03T22:47:06Z"
build_hash: 00e081fb541587f33970ad80c99f2ac02e9c2525
build_date: "2024-01-08T17:38:00Z"
build_hash: 87c16d7c2c571fb6fc0e5299ccebbc9143ef64c4
go_version: go1.21.5
version: v0.28.0-8-g00e081f
version: v0.27.1-19-g87c16d7
api_directory_checksum: 8b27f9e65dbad1f5f825c84d1dbe8fd333baf2a5
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
Expand Down
2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/ec2-controller
newTag: 1.2.0
newTag: 1.1.1
4 changes: 2 additions & 2 deletions helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.2.0
appVersion: 1.2.0
version: 1.1.1
appVersion: 1.1.1
home: https://github.com/aws-controllers-k8s/ec2-controller
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ .Chart.Name }} has been installed.
This chart deploys "public.ecr.aws/aws-controllers-k8s/ec2-controller:1.2.0".
This chart deploys "public.ecr.aws/aws-controllers-k8s/ec2-controller:1.1.1".

Check its status by running:
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
Expand Down
2 changes: 1 addition & 1 deletion helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: public.ecr.aws/aws-controllers-k8s/ec2-controller
tag: 1.2.0
tag: 1.1.1
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down
5 changes: 5 additions & 0 deletions pkg/resource/security_group/sdk.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion templates/hooks/security_group/sdk_read_many_post_set_output.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
if found {

// Needed because SecurityGroups Name are held in GroupName property of the AWS resource
ko.Spec.Name = resp.SecurityGroups[0].GroupName

Comment on lines +2 to +5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You also need to add generated file in this PR.

This seems to be a good approach to handle adoptedResource

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pcolazurdo

Please let me know if you plan to make this change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I was sick, new version with generated files should be in

rm.addRulesToSpec(ko, resp.SecurityGroups[0])

// A ReadOne call for SecurityGroup Rules (NOT SecurityGroups)
Expand All @@ -8,4 +12,4 @@
} else {
ko.Status.Rules = rules
}
}
}