Skip to content

Commit cf98a20

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.45.0, code-generator v0.45.0 (#76)
### Update to ACK runtime `v0.45.0`, code-generator `v0.45.0` ---------- * ACK code-generator `v0.45.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.45.0) * ACK runtime `v0.45.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.45.0) ---------- NOTE: This PR increments the release version of service controller from `v1.1.9` to `v1.1.10` Once this PR is merged, release `v1.1.10` 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 Running GO mod tidy 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.10 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.
1 parent 4b7895a commit cf98a20

File tree

10 files changed

+66
-65
lines changed

10 files changed

+66
-65
lines changed

‎OWNERS_ALIASES‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ aliases:
77
- michaelhtm
88
- TiberiuGC
99
- rushmash91
10+
- knottnt
1011
# emeritus-core-ack-team:
1112
# - jaypipes
1213
# - jljaco

‎apis/v1alpha1/ack-generate-metadata.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2025-04-29T03:41:47Z"
3-
build_hash: ab8fa0bbefe77c9682f53251412fd8d1002ba30f
4-
go_version: go1.24.1
5-
version: v0.44.0-3-gab8fa0b
2+
build_date: "2025-05-02T16:57:34Z"
3+
build_hash: f8dc5330705b3752ce07dce0ac831161fd4cb14f
4+
go_version: go1.24.2
5+
version: v0.45.0
66
api_directory_checksum: 2627dc306e3a83c86c04050c6c4336451459e728
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.32.6

‎config/controller/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
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/sqs-controller
9-
newTag: 1.1.9
9+
newTag: 1.1.10

‎go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ toolchain go1.24.1
77
require (
88
github.com/aws-controllers-k8s/iam-controller v1.1.1
99
github.com/aws-controllers-k8s/kms-controller v1.0.2
10-
github.com/aws-controllers-k8s/runtime v0.44.0
10+
github.com/aws-controllers-k8s/runtime v0.45.0
1111
github.com/aws/aws-sdk-go v1.55.5
1212
github.com/aws/aws-sdk-go-v2 v1.34.0
1313
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.10
1414
github.com/aws/smithy-go v1.22.2
1515
github.com/go-logr/logr v1.4.2
1616
github.com/micahhausler/aws-iam-policy v0.4.2
1717
github.com/spf13/pflag v1.0.5
18-
github.com/stretchr/testify v1.9.0
1918
k8s.io/api v0.32.1
2019
k8s.io/apimachinery v0.32.1
2120
k8s.io/client-go v0.32.1
@@ -63,7 +62,6 @@ require (
6362
github.com/modern-go/reflect2 v1.0.2 // indirect
6463
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6564
github.com/pkg/errors v0.9.1 // indirect
66-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6765
github.com/prometheus/client_golang v1.19.1 // indirect
6866
github.com/prometheus/client_model v0.6.1 // indirect
6967
github.com/prometheus/common v0.55.0 // indirect

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/aws-controllers-k8s/iam-controller v1.1.1 h1:O6arh7DNlQF26MEKzgA2/kBE
22
github.com/aws-controllers-k8s/iam-controller v1.1.1/go.mod h1:2+ARwRpazTq5MErjMz0MpXHhtAzRfNtY56Uj0gvu9vE=
33
github.com/aws-controllers-k8s/kms-controller v1.0.2 h1:v8nh/oaX/U6spCwBDaWyem7XXpzoP/MnkJyEjNOZN9s=
44
github.com/aws-controllers-k8s/kms-controller v1.0.2/go.mod h1:BeoijsyGjJ9G5VcDjpFdxBW0IxaeKXYX497XmUJiPSQ=
5-
github.com/aws-controllers-k8s/runtime v0.44.0 h1:Et0Gikkxx4tJ6+dyK6w88DZqYRbpUTpBHCEny0X7gLQ=
6-
github.com/aws-controllers-k8s/runtime v0.44.0/go.mod h1:G2UMBKA7qgXG4JV16NTIUp715uqvUEvWaa7TG1I527U=
5+
github.com/aws-controllers-k8s/runtime v0.45.0 h1:b0xCqIE1SNve/jcJPW/QkCGkDmjxWtWTDFHKZpHJcFQ=
6+
github.com/aws-controllers-k8s/runtime v0.45.0/go.mod h1:G2UMBKA7qgXG4JV16NTIUp715uqvUEvWaa7TG1I527U=
77
github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
88
github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
99
github.com/aws/aws-sdk-go-v2 v1.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU=

‎helm/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: sqs-chart
33
description: A Helm chart for the ACK service controller for Amazon Simple Queue Service (SQS)
4-
version: 1.1.9
5-
appVersion: 1.1.9
4+
version: 1.1.10
5+
appVersion: 1.1.10
66
home: https://github.com/aws-controllers-k8s/sqs-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎helm/templates/NOTES.txt‎

Lines changed: 1 addition & 1 deletion
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/sqs-controller:1.1.9".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/sqs-controller:1.1.10".
33

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

‎helm/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

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

‎pkg/resource/queue/hooks_test.go‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -42,51 +42,51 @@ func TestComparePolicy(t *testing.T) {
4242
invalidJSON := `{"Version": "2012-10-17", "Statement": [`
4343

4444
tests := []struct {
45-
name string
46-
policyA *string
47-
policyB *string
45+
name string
46+
policyA *string
47+
policyB *string
4848
expectDiff bool
4949
}{
5050
{
51-
name: "both nil",
52-
policyA: nil,
53-
policyB: nil,
51+
name: "both nil",
52+
policyA: nil,
53+
policyB: nil,
5454
expectDiff: false,
5555
},
5656
{
57-
name: "a nil, b not nil",
58-
policyA: nil,
59-
policyB: strPtr(basePolicyJSON),
57+
name: "a nil, b not nil",
58+
policyA: nil,
59+
policyB: strPtr(basePolicyJSON),
6060
expectDiff: true,
6161
},
6262
{
63-
name: "both equal pointers",
64-
policyA: strPtr(basePolicyJSON),
65-
policyB: strPtr(basePolicyJSON),
63+
name: "both equal pointers",
64+
policyA: strPtr(basePolicyJSON),
65+
policyB: strPtr(basePolicyJSON),
6666
expectDiff: false,
6767
},
6868
{
69-
name: "semantically equivalent",
70-
policyA: strPtr(basePolicyJSON),
71-
policyB: strPtr(equivalentPolicyJSON),
69+
name: "semantically equivalent",
70+
policyA: strPtr(basePolicyJSON),
71+
policyB: strPtr(equivalentPolicyJSON),
7272
expectDiff: false,
7373
},
7474
{
75-
name: "different policies",
76-
policyA: strPtr(basePolicyJSON),
77-
policyB: strPtr(differentPolicyJSON),
75+
name: "different policies",
76+
policyA: strPtr(basePolicyJSON),
77+
policyB: strPtr(differentPolicyJSON),
7878
expectDiff: true,
7979
},
8080
{
81-
name: "a invalid, b valid",
82-
policyA: strPtr(invalidJSON),
83-
policyB: strPtr(basePolicyJSON),
81+
name: "a invalid, b valid",
82+
policyA: strPtr(invalidJSON),
83+
policyB: strPtr(basePolicyJSON),
8484
expectDiff: true,
8585
},
8686
{
87-
name: "both invalid",
88-
policyA: strPtr(invalidJSON),
89-
policyB: strPtr(`{"another": "invalid`),
87+
name: "both invalid",
88+
policyA: strPtr(invalidJSON),
89+
policyB: strPtr(`{"another": "invalid`),
9090
expectDiff: true,
9191
},
9292
}
@@ -138,51 +138,51 @@ func TestCompareRedrivePolicy(t *testing.T) {
138138
invalidJSON := `{"deadLetterTargetArn":`
139139

140140
tests := []struct {
141-
name string
142-
policyA *string
143-
policyB *string
141+
name string
142+
policyA *string
143+
policyB *string
144144
expectDiff bool
145145
}{
146146
{
147-
name: "both nil",
148-
policyA: nil,
149-
policyB: nil,
147+
name: "both nil",
148+
policyA: nil,
149+
policyB: nil,
150150
expectDiff: false,
151151
},
152152
{
153-
name: "a nil, b not nil",
154-
policyA: nil,
155-
policyB: strPtr(basePolicyJSON),
153+
name: "a nil, b not nil",
154+
policyA: nil,
155+
policyB: strPtr(basePolicyJSON),
156156
expectDiff: true,
157157
},
158158
{
159-
name: "both equal pointers",
160-
policyA: strPtr(basePolicyJSON),
161-
policyB: strPtr(basePolicyJSON),
159+
name: "both equal pointers",
160+
policyA: strPtr(basePolicyJSON),
161+
policyB: strPtr(basePolicyJSON),
162162
expectDiff: false,
163163
},
164164
{
165-
name: "semantically equivalent",
166-
policyA: strPtr(basePolicyJSON),
167-
policyB: strPtr(equivalentPolicyJSON),
165+
name: "semantically equivalent",
166+
policyA: strPtr(basePolicyJSON),
167+
policyB: strPtr(equivalentPolicyJSON),
168168
expectDiff: false,
169169
},
170170
{
171-
name: "different policies",
172-
policyA: strPtr(basePolicyJSON),
173-
policyB: strPtr(differentPolicyJSON),
171+
name: "different policies",
172+
policyA: strPtr(basePolicyJSON),
173+
policyB: strPtr(differentPolicyJSON),
174174
expectDiff: true,
175175
},
176176
{
177-
name: "a invalid, b valid",
178-
policyA: strPtr(invalidJSON),
179-
policyB: strPtr(basePolicyJSON),
177+
name: "a invalid, b valid",
178+
policyA: strPtr(invalidJSON),
179+
policyB: strPtr(basePolicyJSON),
180180
expectDiff: true,
181181
},
182182
{
183-
name: "both invalid",
184-
policyA: strPtr(invalidJSON),
185-
policyB: strPtr(`{"another": "invalid`),
183+
name: "both invalid",
184+
policyA: strPtr(invalidJSON),
185+
policyB: strPtr(`{"another": "invalid`),
186186
expectDiff: true,
187187
},
188188
}
@@ -194,7 +194,7 @@ func TestCompareRedrivePolicy(t *testing.T) {
194194
resB := &resource{ko: &svcapitypes.Queue{Spec: svcapitypes.QueueSpec{RedrivePolicy: tt.policyB}}}
195195

196196
compareRedrivePolicy(delta, resA, resB)
197-
197+
198198
diffCount := len(delta.Differences)
199199

200200
if tt.expectDiff {
@@ -222,4 +222,4 @@ func TestCompareRedrivePolicy(t *testing.T) {
222222
}
223223
})
224224
}
225-
}
225+
}

‎pkg/resource/queue/resource.go‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)