Merge origin/main and resolve metadata conflict

anas099 · anas099 · commit 127ea778434c · 2026-06-20T12:32:48.000+01:00
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,13 +1,13 @@
 ack_generate_info:
   build_date: "2026-06-19T12:50:10Z"
   build_hash: e581e886276bd781409a3fb11fa665ea31de17d4
-  go_version: go1.26.3
+  go_version: go1.26.0
   version: v0.59.1
 api_directory_checksum: 1160a330c5825c076085ff877addb26a2a8aa839
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 5a412f0cf6a9b9774ccbe2c7214baf1b14bdb89e
+  file_checksum: 1339c27fce2a31f19582bb8951f169b93d4af15b
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -178,6 +178,8 @@ resources:
           method: Create
       Path:
         late_initialize: {}
+      PolicyDocument:
+        is_iam_policy: true
       Tags:
         compare:
           is_ignored: true
diff --git 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/iam-controller
-  newTag: 1.7.0
+  newTag: 1.7.1
diff --git a/generator.yaml b/generator.yaml
@@ -178,6 +178,8 @@ resources:
           method: Create
       Path:
         late_initialize: {}
+      PolicyDocument:
+        is_iam_policy: true
       Tags:
         compare:
           is_ignored: true
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: iam-chart
 description: A Helm chart for the ACK service controller for AWS Identity & Access Management (IAM)
-version: 1.7.0
-appVersion: 1.7.0
+version: 1.7.1
+appVersion: 1.7.1
 home: https://github.com/aws-controllers-k8s/iam-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:
diff --git 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/iam-controller:1.7.0".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/iam-controller:1.7.1".
 
 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
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/iam-controller
-  tag: 1.7.0
+  tag: 1.7.1
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/pkg/resource/policy/delta.go b/pkg/resource/policy/delta.go
