diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index b3fee29..45aa4d9 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2025-09-04T20:26:34Z" - build_hash: 1d9076d0211773ff8ab8682b28b912c7ece10676 - go_version: go1.25.0 - version: v0.51.0-2-g1d9076d + build_date: "2025-09-19T16:57:11Z" + build_hash: 6b4211163dcc34776b01da9a18217bac0f4103fd + go_version: go1.24.6 + version: v0.52.0 api_directory_checksum: 4ec6553b4d5f236283df39b882ff81fe134e095e api_version: v1alpha1 aws_sdk_go_version: v1.38.1 diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index fc70b5f..a5498a4 100644 --- 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/ecr-controller - newTag: 1.3.0 + newTag: 1.3.1 diff --git a/go.mod b/go.mod index db886e7..8069edd 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.24.1 require ( github.com/aws-controllers-k8s/iam-controller v1.5.0 - github.com/aws-controllers-k8s/runtime v0.51.0 + github.com/aws-controllers-k8s/runtime v0.52.0 github.com/aws-controllers-k8s/secretsmanager-controller v1.1.0 github.com/aws/aws-sdk-go v1.49.0 github.com/aws/aws-sdk-go-v2 v1.38.1 diff --git a/go.sum b/go.sum index 682f33f..5856840 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/aws-controllers-k8s/iam-controller v1.5.0 h1:O9AYY5P8eIFircfkjIEwkXwGgfXpGRk6xEn8Qb78BiU= github.com/aws-controllers-k8s/iam-controller v1.5.0/go.mod h1:V19V1L0e1Gde8/7Ti0wKugtXU9oK8zaaYDe54TQm94E= -github.com/aws-controllers-k8s/runtime v0.51.0 h1:ZKu1DXPG7+CsvbEPLMCGqWFdfK37kSbceLzYf9lRZbw= -github.com/aws-controllers-k8s/runtime v0.51.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc= +github.com/aws-controllers-k8s/runtime v0.52.0 h1:Q5UIAn6SSBr60t/DiU/zr6NLBlUuK2AG3yy2ma/9gDU= +github.com/aws-controllers-k8s/runtime v0.52.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc= github.com/aws-controllers-k8s/secretsmanager-controller v1.1.0 h1:S+8FLIRMcwzR+Vub86L3GJet/XMCMGHIjVyxnNn0dNI= github.com/aws-controllers-k8s/secretsmanager-controller v1.1.0/go.mod h1:Q8+dGg+vmB8FcUftJp+Jwe47V5xVVelYWCzCVuKqxOE= github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 14123cc..723eabe 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: ecr-chart description: A Helm chart for the ACK service controller for Amazon Elastic Container Registry (ECR) -version: 1.3.0 -appVersion: 1.3.0 +version: 1.3.1 +appVersion: 1.3.1 home: https://github.com/aws-controllers-k8s/ecr-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 index ae0aae6..b1671f7 100644 --- 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/ecr-controller:1.3.0". +This chart deploys "public.ecr.aws/aws-controllers-k8s/ecr-controller:1.3.1". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index 50f41f1..b631675 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -10,6 +10,9 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} k8s-app: {{ include "ack-ecr-controller.app.name" . }} helm.sh/chart: {{ include "ack-ecr-controller.chart.name-version" . }} +{{- range $key, $value := .Values.deployment.labels }} + {{ $key }}: {{ $value | quote }} +{{- end }} spec: replicas: {{ .Values.deployment.replicas }} selector: @@ -88,6 +91,7 @@ spec: - --feature-gates - "$(FEATURE_GATES)" {{- end }} + - --enable-carm={{ .Values.enableCARM }} image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} name: controller diff --git a/helm/values.schema.json b/helm/values.schema.json index e656c74..c3f56a0 100644 --- a/helm/values.schema.json +++ b/helm/values.schema.json @@ -263,6 +263,11 @@ }, "type": "object" }, + "enableCARM": { + "description": "Parameter to enable or disable cross account resource management.", + "type": "boolean", + "default": true + }, "serviceAccount": { "description": "ServiceAccount settings", "properties": { diff --git a/helm/values.yaml b/helm/values.yaml index ed245b7..fcf3213 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/ecr-controller - tag: 1.3.0 + tag: 1.3.1 pullPolicy: IfNotPresent pullSecrets: [] @@ -168,6 +168,9 @@ leaderElection: # pod. namespace: "" +# Enable Cross Account Resource Management (default = true). Set this to false to disable cross account resource management. +enableCARM: true + # Configuration for feature gates. These are optional controller features that # can be individually enabled ("true") or disabled ("false") by adding key/value # pairs below.