Skip to content

Commit f031a72

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

File tree

11 files changed

+31
-19
lines changed

11 files changed

+31
-19
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2025-08-14T23:49:15Z"
3-
build_hash: b6df33f8c7f55b234555c0b578b8de43c74771a8
2+
build_date: "2025-09-19T17:30:39Z"
3+
build_hash: 6b4211163dcc34776b01da9a18217bac0f4103fd
44
go_version: go1.24.6
5-
version: v0.51.0
5+
version: v0.52.0
66
api_directory_checksum: b3aac8d5f9f5b91ae438c9ca3fe4e905658bde01
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/emrcontainers-controller
9-
newTag: 1.1.0
9+
newTag: 1.1.1

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.0
55
toolchain go1.24.1
66

77
require (
8-
github.com/aws-controllers-k8s/runtime v0.51.0
8+
github.com/aws-controllers-k8s/runtime v0.52.0
99
github.com/aws/aws-sdk-go v1.49.0
1010
github.com/aws/aws-sdk-go-v2 v1.35.0
1111
github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.33.14

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/aws-controllers-k8s/runtime v0.51.0 h1:ZKu1DXPG7+CsvbEPLMCGqWFdfK37kSbceLzYf9lRZbw=
2-
github.com/aws-controllers-k8s/runtime v0.51.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc=
1+
github.com/aws-controllers-k8s/runtime v0.52.0 h1:Q5UIAn6SSBr60t/DiU/zr6NLBlUuK2AG3yy2ma/9gDU=
2+
github.com/aws-controllers-k8s/runtime v0.52.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc=
33
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
44
github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
55
github.com/aws/aws-sdk-go-v2 v1.35.0 h1:jTPxEJyzjSuuz0wB+302hr8Eu9KUI+Zv8zlujMGJpVI=

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: emrcontainers-chart
33
description: A Helm chart for the ACK service controller for Amazon EMR on EKS (EMRContainers)
4-
version: 1.1.0
5-
appVersion: 1.1.0
4+
version: 1.1.1
5+
appVersion: 1.1.1
66
home: https://github.com/aws-controllers-k8s/emrcontainers-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/emrcontainers-controller:1.1.0".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/emrcontainers-controller:1.1.1".
33

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

helm/templates/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ metadata:
1010
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
1111
k8s-app: {{ include "ack-emrcontainers-controller.app.name" . }}
1212
helm.sh/chart: {{ include "ack-emrcontainers-controller.chart.name-version" . }}
13+
{{- range $key, $value := .Values.deployment.labels }}
14+
{{ $key }}: {{ $value | quote }}
15+
{{- end }}
1316
spec:
1417
replicas: {{ .Values.deployment.replicas }}
1518
selector:
@@ -88,6 +91,7 @@ spec:
8891
- --feature-gates
8992
- "$(FEATURE_GATES)"
9093
{{- end }}
94+
- --enable-carm={{ .Values.enableCARM }}
9195
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
9296
imagePullPolicy: {{ .Values.image.pullPolicy }}
9397
name: controller

helm/values.schema.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,11 @@
263263
},
264264
"type": "object"
265265
},
266+
"enableCARM": {
267+
"description": "Parameter to enable or disable cross account resource management.",
268+
"type": "boolean",
269+
"default": true
270+
},
266271
"serviceAccount": {
267272
"description": "ServiceAccount settings",
268273
"properties": {

helm/values.yaml

Lines changed: 4 additions & 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/emrcontainers-controller
7-
tag: 1.1.0
7+
tag: 1.1.1
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -168,6 +168,9 @@ leaderElection:
168168
# pod.
169169
namespace: ""
170170

171+
# Enable Cross Account Resource Management (default = true). Set this to false to disable cross account resource management.
172+
enableCARM: true
173+
171174
# Configuration for feature gates. These are optional controller features that
172175
# can be individually enabled ("true") or disabled ("false") by adding key/value
173176
# pairs below.

pkg/resource/job_run/resource.go

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

0 commit comments

Comments
 (0)