From 53345b74e500a65a2d2b27469c63a9f2a0f60313 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 2 May 2025 16:40:56 +0000 Subject: [PATCH] Update to ACK runtime `v0.45.0`, code-generator `v0.45.0` --- OWNERS_ALIASES | 1 + apis/v1alpha1/ack-generate-metadata.yaml | 8 ++++---- config/controller/kustomization.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- helm/Chart.yaml | 4 ++-- helm/templates/NOTES.txt | 2 +- helm/values.yaml | 2 +- pkg/resource/broker/resource.go | 4 +++- 9 files changed, 16 insertions(+), 13 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index ded809f..ba1ee3b 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -7,6 +7,7 @@ aliases: - michaelhtm - TiberiuGC - rushmash91 + - knottnt # emeritus-core-ack-team: # - jaypipes # - jljaco diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 63ba14d..b1707c5 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-03-27T16:18:00Z" - build_hash: 980cb1e4734f673d16101cf55206b84ca639ec01 - go_version: go1.24.1 - version: v0.44.0 + build_date: "2025-05-02T16:40:20Z" + build_hash: f8dc5330705b3752ce07dce0ac831161fd4cb14f + go_version: go1.24.2 + version: v0.45.0 api_directory_checksum: 524e0af3e7ceea86a3153c12c06091ea924d3410 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index f933a87..ff9b9b6 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/mq-controller - newTag: 1.0.6 + newTag: 1.0.7 diff --git a/go.mod b/go.mod index 1ad9c39..a03f72e 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.24.1 require ( github.com/aws-controllers-k8s/ec2-controller v0.0.21 - github.com/aws-controllers-k8s/runtime v0.44.0 + github.com/aws-controllers-k8s/runtime v0.45.0 github.com/aws/aws-sdk-go v1.49.0 github.com/aws/aws-sdk-go-v2 v1.34.0 github.com/aws/aws-sdk-go-v2/service/mq v1.27.13 diff --git a/go.sum b/go.sum index 572ea64..6e59869 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/aws-controllers-k8s/ec2-controller v0.0.21 h1:5O7/9aED2Tl9OT0TL2rWrc1Ix5V1UxYEgDKAhvFhPJQ= github.com/aws-controllers-k8s/ec2-controller v0.0.21/go.mod h1:OMsmJeJ3iQZ1sJgs3hqnjBRnJ3hmTzJUO38W5rxnB5M= -github.com/aws-controllers-k8s/runtime v0.44.0 h1:Et0Gikkxx4tJ6+dyK6w88DZqYRbpUTpBHCEny0X7gLQ= -github.com/aws-controllers-k8s/runtime v0.44.0/go.mod h1:G2UMBKA7qgXG4JV16NTIUp715uqvUEvWaa7TG1I527U= +github.com/aws-controllers-k8s/runtime v0.45.0 h1:b0xCqIE1SNve/jcJPW/QkCGkDmjxWtWTDFHKZpHJcFQ= +github.com/aws-controllers-k8s/runtime v0.45.0/go.mod h1:G2UMBKA7qgXG4JV16NTIUp715uqvUEvWaa7TG1I527U= github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY= github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 95b0132..129d19b 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: mq-chart description: A Helm chart for the ACK service controller for Amazon MQ (MQ) -version: 1.0.6 -appVersion: 1.0.6 +version: 1.0.7 +appVersion: 1.0.7 home: https://github.com/aws-controllers-k8s/mq-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 7e5d086..c0289bb 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/mq-controller:1.0.6". +This chart deploys "public.ecr.aws/aws-controllers-k8s/mq-controller:1.0.7". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/helm/values.yaml b/helm/values.yaml index 3349dc8..05b5107 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/mq-controller - tag: 1.0.6 + tag: 1.0.7 pullPolicy: IfNotPresent pullSecrets: [] diff --git a/pkg/resource/broker/resource.go b/pkg/resource/broker/resource.go index 59084d2..8b8f2b6 100644 --- a/pkg/resource/broker/resource.go +++ b/pkg/resource/broker/resource.go @@ -16,6 +16,8 @@ package broker import ( + "fmt" + ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" ackerrors "github.com/aws-controllers-k8s/runtime/pkg/errors" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" @@ -97,7 +99,7 @@ func (r *resource) SetIdentifiers(identifier *ackv1alpha1.AWSIdentifiers) error func (r *resource) PopulateResourceFromAnnotation(fields map[string]string) error { tmp, ok := fields["brokerID"] if !ok { - return ackerrors.MissingNameIdentifier + return ackerrors.NewTerminalError(fmt.Errorf("required field missing: brokerID")) } r.ko.Status.BrokerID = &tmp