Skip to content

Commit 026f1ae

Browse files
authored
Add Adoption by annotation logic and tests (#123)
Description of changes: resources tested: * Policy By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 31393b8 commit 026f1ae

27 files changed

+269
-48
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2024-10-10T04:09:12Z"
3-
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
2+
build_date: "2024-12-04T21:05:49Z"
3+
build_hash: 5b95c1667a03835266df2d3f598718dd164184af
44
go_version: go1.23.2
5-
version: v0.39.1
5+
version: v0.39.1-8-g5b95c16
66
api_directory_checksum: 761a2c708651b0273bf39d98dddaf029de23d337
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.49.0

config/controller/deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ spec:
4141
- "$(LEADER_ELECTION_NAMESPACE)"
4242
- --reconcile-default-max-concurrent-syncs
4343
- "$(RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS)"
44+
- --feature-gates
45+
- "$(FEATURE_GATES)"
4446
image: controller:latest
4547
name: controller
4648
ports:
@@ -76,6 +78,8 @@ spec:
7678
value: "ack-system"
7779
- name: "RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS"
7880
value: "1"
81+
- name: "FEATURE_GATES"
82+
value: ""
7983
securityContext:
8084
allowPrivilegeEscalation: false
8185
privileged: false

config/controller/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ kind: Kustomization
66
images:
77
- name: controller
88
newName: public.ecr.aws/aws-controllers-k8s/iam-controller
9-
newTag: 1.3.13
9+
newTag: 1.3.9

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.0
55
toolchain go1.22.5
66

77
require (
8-
github.com./aws-controllers-k8s/runtime v0.39.0
8+
github.com./aws-controllers-k8s/runtime v0.39.1-0.20241202082353-a6b0014a8130
99
github.com./aws/aws-sdk-go v1.49.0
1010
github.com./go-logr/logr v1.4.2
1111
github.com./micahhausler/aws-iam-policy v0.4.2

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ github.com./a-hilaly/aws-iam-policy v0.0.0-20231121054900-2c56e839ca53 h1:2uNM0nR
22
github.com./a-hilaly/aws-iam-policy v0.0.0-20231121054900-2c56e839ca53/go.mod h1:Ojgst9ZFn+VEEJpqtuw/LxVGqEf2+hwWBlkYWvF/XWM=
33
github.com./aws-controllers-k8s/runtime v0.39.0 h1:IgOXluSzvb4UcDr9eU7SPw5MJnL7kt5R6DuF5Qu9zVQ=
44
github.com./aws-controllers-k8s/runtime v0.39.0/go.mod h1:G07g26y1cxyZO6Ngp+LwXf03CqFyLNL7os4Py4IdyGY=
5+
github.com./aws-controllers-k8s/runtime v0.39.1-0.20241202082353-a6b0014a8130 h1:EoXYRrpBX2hi5B1IawKr2LJTsVsreHsJdxULLlMNO9U=
6+
github.com./aws-controllers-k8s/runtime v0.39.1-0.20241202082353-a6b0014a8130/go.mod h1:G07g26y1cxyZO6Ngp+LwXf03CqFyLNL7os4Py4IdyGY=
57
github.com./aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
68
github.com./aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
79
github.com./beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: iam-chart
33
description: A Helm chart for the ACK service controller for AWS Identity & Access Management (IAM)
4-
version: 1.3.13
5-
appVersion: 1.3.13
4+
version: 1.3.9
5+
appVersion: 1.3.9
66
home: https://github.com./aws-controllers-k8s/iam-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

helm/templates/NOTES.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ .Chart.Name }} has been installed.
2-
This chart deploys "public.ecr.aws/aws-controllers-k8s/iam-controller:1.3.13".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/iam-controller:1.3.9".
33

44
Check its status by running:
55
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

helm/templates/caches-role-binding.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ roleRef:
88
name: ack-namespaces-cache-iam-controller
99
subjects:
1010
- kind: ServiceAccount
11-
name: ack-iam-controller
11+
name: {{ include "ack-iam-controller.service-account.name" . }}
1212
namespace: {{ .Release.Namespace }}
1313
---
1414
apiVersion: rbac.authorization.k8s.io/v1
@@ -22,5 +22,5 @@ roleRef:
2222
name: ack-configmaps-cache-iam-controller
2323
subjects:
2424
- kind: ServiceAccount
25-
name: ack-iam-controller
26-
namespace: {{ .Release.Namespace }}
25+
name: {{ include "ack-iam-controller.service-account.name" . }}
26+
namespace: {{ .Release.Namespace }}

helm/values.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/iam-controller
7-
tag: 1.3.13
7+
tag: 1.3.9
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -163,4 +163,6 @@ featureGates:
163163
# Enables the Team level granularity for CARM. See https://github.com./aws-controllers-k8s/community/issues/2031
164164
TeamLevelCARM: false
165165
# Enable ReadOnlyResources feature/annotation.
166-
ReadOnlyResources: false
166+
ReadOnlyResources: false
167+
# Enable ResourceAdoption feature/annotation.
168+
ResourceAdoption: false

pkg/resource/group/descriptor.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/group/resource.go

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/instance_profile/descriptor.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/instance_profile/resource.go

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/open_id_connect_provider/descriptor.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/open_id_connect_provider/resource.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/policy/descriptor.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/policy/resource.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/role/descriptor.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/role/resource.go

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)