Update to ACK runtime v0.40.0, code-generator v0.40.0 (#65)

### Update to ACK runtime `v0.40.0`, code-generator `v0.40.0` ---------- * ACK code-generator `v0.40.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.40.0) * ACK runtime `v0.40.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.40.0) ---------- NOTE: This PR increments the release version of service controller from `v1.1.2` to `v1.1.3` Once this PR is merged, release `v1.1.3` will be automatically created for `sqs-controller` **Please close this PR, if you do not want the new patch release for `sqs-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building sqs-controller ==== Copying common custom resource definitions into sqs Building Kubernetes API objects for sqs Generating deepcopy code for sqs Generating custom resource definitions for sqs Building service controller for sqs Generating RBAC manifests for sqs Running gofmt against generated code for sqs Updating additional GitHub repository maintenance files ==== building sqs-controller release artifacts ==== Building release artifacts for sqs-v1.1.3 Generating common custom resource definitions Generating custom resource definitions for sqs Generating RBAC manifests for sqs ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
aws-controllers-k8s · Dec 11, 2024 · 87acc8c · 87acc8c
1 parent 8367ec6
commit 87acc8c
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 21 deletions.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,8 +1,8 @@
 ack_generate_info:
-  build_date: "2024-10-24T02:20:42Z"
-  build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
-  go_version: go1.23.2
-  version: v0.39.1
+  build_date: "2024-12-09T17:23:51Z"
+  build_hash: 631aeb190e332addb8379672df6367a0875dce88
+  go_version: go1.23.3
+  version: v0.40.0
 api_directory_checksum: 8f26009577f13f96d7f6ba08a96e95f2f7f08b86
 api_version: v1alpha1
 aws_sdk_go_version: v1.55.5

diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml
@@ -41,6 +41,8 @@ spec:
         - "$(LEADER_ELECTION_NAMESPACE)"
         - --reconcile-default-max-concurrent-syncs
         - "$(RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS)"
+        - --feature-gates
+        - "$(FEATURE_GATES)"
         image: controller:latest
         name: controller
         ports:
@@ -76,6 +78,8 @@ spec:
           value: "ack-system"
         - name: "RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS"
           value: "1"
+        - name: "FEATURE_GATES"
+          value: ""
         securityContext:
           allowPrivilegeEscalation: false
           privileged: false

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/sqs-controller
-  newTag: 1.1.2
+  newTag: 1.1.3
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.22.5
 require (
 	github.com/aws-controllers-k8s/iam-controller v1.1.1
 	github.com/aws-controllers-k8s/kms-controller v1.0.2
-	github.com/aws-controllers-k8s/runtime v0.39.0
+	github.com/aws-controllers-k8s/runtime v0.40.0
 	github.com/aws/aws-sdk-go v1.55.5
 	github.com/go-logr/logr v1.4.2
 	github.com/spf13/pflag v1.0.5

diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ github.com/aws-controllers-k8s/iam-controller v1.1.1 h1:O6arh7DNlQF26MEKzgA2/kBE
 github.com/aws-controllers-k8s/iam-controller v1.1.1/go.mod h1:2+ARwRpazTq5MErjMz0MpXHhtAzRfNtY56Uj0gvu9vE=
 github.com/aws-controllers-k8s/kms-controller v1.0.2 h1:v8nh/oaX/U6spCwBDaWyem7XXpzoP/MnkJyEjNOZN9s=
 github.com/aws-controllers-k8s/kms-controller v1.0.2/go.mod h1:BeoijsyGjJ9G5VcDjpFdxBW0IxaeKXYX497XmUJiPSQ=
-github.com/aws-controllers-k8s/runtime v0.39.0 h1:IgOXluSzvb4UcDr9eU7SPw5MJnL7kt5R6DuF5Qu9zVQ=
-github.com/aws-controllers-k8s/runtime v0.39.0/go.mod h1:G07g26y1cxyZO6Ngp+LwXf03CqFyLNL7os4Py4IdyGY=
+github.com/aws-controllers-k8s/runtime v0.40.0 h1:FplFYgzCIbQsPafarP3dy/4bG1uGR8G1OLYOWO4a7Lc=
+github.com/aws-controllers-k8s/runtime v0.40.0/go.mod h1:G07g26y1cxyZO6Ngp+LwXf03CqFyLNL7os4Py4IdyGY=
 github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
 github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: sqs-chart
 description: A Helm chart for the ACK service controller for Amazon Simple Queue Service (SQS)
-version: 1.1.2
-appVersion: 1.1.2
+version: 1.1.3
+appVersion: 1.1.3
 home: https://github.com/aws-controllers-k8s/sqs-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/sqs-controller:1.1.2".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/sqs-controller:1.1.3".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

diff --git a/helm/templates/caches-role-binding.yaml b/helm/templates/caches-role-binding.yaml
@@ -8,7 +8,7 @@ roleRef:
   name: ack-namespaces-cache-sqs-controller
 subjects:
 - kind: ServiceAccount
-  name: ack-sqs-controller
+  name: {{ include "ack-sqs-controller.service-account.name" . }}
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -22,5 +22,5 @@ roleRef:
   name: ack-configmaps-cache-sqs-controller
 subjects:
 - kind: ServiceAccount
-  name: ack-sqs-controller
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "ack-sqs-controller.service-account.name" . }}
+  namespace: {{ .Release.Namespace }}
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/sqs-controller
-  tag: 1.1.2
+  tag: 1.1.3
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -163,4 +163,6 @@ featureGates:
   # Enables the Team level granularity for CARM. See https://github.com/aws-controllers-k8s/community/issues/2031
   TeamLevelCARM: false
   # Enable ReadOnlyResources feature/annotation. 
-  ReadOnlyResources: false
+  ReadOnlyResources: false
+  # Enable ResourceAdoption feature/annotation. 
+  ResourceAdoption: false
diff --git a/pkg/resource/queue/descriptor.go b/pkg/resource/queue/descriptor.go
diff --git a/pkg/resource/queue/resource.go b/pkg/resource/queue/resource.go