Skip to content

Commit a3bfd45

Browse files
authored
Update to ACK runtime v0.40.0, code-generator v0.40.0 (#87)
### 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.0.0` to `v1.0.1` Once this PR is merged, release `v1.0.1` will be automatically created for `mq-controller` **Please close this PR, if you do not want the new patch release for `mq-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building mq-controller ==== Copying common custom resource definitions into mq Building Kubernetes API objects for mq Generating deepcopy code for mq Generating custom resource definitions for mq Building service controller for mq Generating RBAC manifests for mq Running gofmt against generated code for mq Updating additional GitHub repository maintenance files ==== building mq-controller release artifacts ==== Building release artifacts for mq-v1.0.1 Generating common custom resource definitions Generating custom resource definitions for mq Generating RBAC manifests for mq ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 864c5a6 commit a3bfd45

File tree

11 files changed

+38
-21
lines changed

11 files changed

+38
-21
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2024-10-10T04:10:49Z"
3-
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
4-
go_version: go1.23.2
5-
version: v0.39.1
2+
build_date: "2024-12-09T17:26:38Z"
3+
build_hash: 631aeb190e332addb8379672df6367a0875dce88
4+
go_version: go1.23.3
5+
version: v0.40.0
66
api_directory_checksum: 2be594918c4fa03c742bb5d656f8b097cbc7f4c5
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

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/mq-controller
9-
newTag: 1.0.0
9+
newTag: 1.0.1

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.22.5
66

77
require (
88
github.com/aws-controllers-k8s/ec2-controller v0.0.21
9-
github.com/aws-controllers-k8s/runtime v0.39.0
9+
github.com/aws-controllers-k8s/runtime v0.40.0
1010
github.com/aws/aws-sdk-go v1.49.0
1111
github.com/go-logr/logr v1.4.2
1212
github.com/spf13/pflag v1.0.5

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/aws-controllers-k8s/ec2-controller v0.0.21 h1:5O7/9aED2Tl9OT0TL2rWrc1Ix5V1UxYEgDKAhvFhPJQ=
22
github.com/aws-controllers-k8s/ec2-controller v0.0.21/go.mod h1:OMsmJeJ3iQZ1sJgs3hqnjBRnJ3hmTzJUO38W5rxnB5M=
3-
github.com/aws-controllers-k8s/runtime v0.39.0 h1:IgOXluSzvb4UcDr9eU7SPw5MJnL7kt5R6DuF5Qu9zVQ=
4-
github.com/aws-controllers-k8s/runtime v0.39.0/go.mod h1:G07g26y1cxyZO6Ngp+LwXf03CqFyLNL7os4Py4IdyGY=
3+
github.com/aws-controllers-k8s/runtime v0.40.0 h1:FplFYgzCIbQsPafarP3dy/4bG1uGR8G1OLYOWO4a7Lc=
4+
github.com/aws-controllers-k8s/runtime v0.40.0/go.mod h1:G07g26y1cxyZO6Ngp+LwXf03CqFyLNL7os4Py4IdyGY=
55
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
66
github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
77
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: mq-chart
33
description: A Helm chart for the ACK service controller for Amazon MQ (MQ)
4-
version: 1.0.0
5-
appVersion: 1.0.0
4+
version: 1.0.1
5+
appVersion: 1.0.1
66
home: https://github.com/aws-controllers-k8s/mq-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/mq-controller:1.0.0".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/mq-controller:1.0.1".
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-mq-controller
99
subjects:
1010
- kind: ServiceAccount
11-
name: ack-mq-controller
11+
name: {{ include "ack-mq-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-mq-controller
2323
subjects:
2424
- kind: ServiceAccount
25-
name: ack-mq-controller
26-
namespace: {{ .Release.Namespace }}
25+
name: {{ include "ack-mq-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/mq-controller
7-
tag: 1.0.0
7+
tag: 1.0.1
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/broker/descriptor.go

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

pkg/resource/broker/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)