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 a77b3c6..d87c07f 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:08:21Z" - build_hash: 980cb1e4734f673d16101cf55206b84ca639ec01 - go_version: go1.24.1 - version: v0.44.0 + build_date: "2025-05-02T16:45:22Z" + build_hash: f8dc5330705b3752ce07dce0ac831161fd4cb14f + go_version: go1.24.2 + version: v0.45.0 api_directory_checksum: 5111539ac4c4401f7da6826a1911e116e83f57a4 api_version: v1alpha1 aws_sdk_go_version: 1.32.6 diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index ae2ed1d..fb0760c 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/apigatewayv2-controller - newTag: 1.0.23 + newTag: 1.0.24 diff --git a/go.mod b/go.mod index e231b59..7112197 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24.0 toolchain go1.24.1 require ( - 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.35.0 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.24.15 diff --git a/go.sum b/go.sum index 4aeeca9..df21311 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -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.35.0 h1:jTPxEJyzjSuuz0wB+302hr8Eu9KUI+Zv8zlujMGJpVI= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 6e7e08e..7c3c930 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: apigatewayv2-chart description: A Helm chart for the ACK service controller for Amazon API Gateway (APIGWv2) -version: 1.0.23 -appVersion: 1.0.23 +version: 1.0.24 +appVersion: 1.0.24 home: https://github.com/aws-controllers-k8s/apigatewayv2-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 7982eca..4566bdb 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/apigatewayv2-controller:1.0.23". +This chart deploys "public.ecr.aws/aws-controllers-k8s/apigatewayv2-controller:1.0.24". 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 33ccbf4..9152732 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/apigatewayv2-controller - tag: 1.0.23 + tag: 1.0.24 pullPolicy: IfNotPresent pullSecrets: [] diff --git a/pkg/resource/api/resource.go b/pkg/resource/api/resource.go index a000c3b..b1a4f69 100644 --- a/pkg/resource/api/resource.go +++ b/pkg/resource/api/resource.go @@ -16,6 +16,8 @@ package api 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["apiID"] if !ok { - return ackerrors.MissingNameIdentifier + return ackerrors.NewTerminalError(fmt.Errorf("required field missing: apiID")) } r.ko.Status.APIID = &tmp diff --git a/pkg/resource/api_mapping/resource.go b/pkg/resource/api_mapping/resource.go index 84edd3f..2f62f82 100644 --- a/pkg/resource/api_mapping/resource.go +++ b/pkg/resource/api_mapping/resource.go @@ -16,6 +16,8 @@ package api_mapping 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" @@ -103,7 +105,7 @@ func (r *resource) SetIdentifiers(identifier *ackv1alpha1.AWSIdentifiers) error func (r *resource) PopulateResourceFromAnnotation(fields map[string]string) error { tmp, ok := fields["apiMappingID"] if !ok { - return ackerrors.MissingNameIdentifier + return ackerrors.NewTerminalError(fmt.Errorf("required field missing: apiMappingID")) } r.ko.Status.APIMappingID = &tmp diff --git a/pkg/resource/authorizer/resource.go b/pkg/resource/authorizer/resource.go index f77d5a1..133c7ae 100644 --- a/pkg/resource/authorizer/resource.go +++ b/pkg/resource/authorizer/resource.go @@ -16,6 +16,8 @@ package authorizer 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" @@ -103,7 +105,7 @@ func (r *resource) SetIdentifiers(identifier *ackv1alpha1.AWSIdentifiers) error func (r *resource) PopulateResourceFromAnnotation(fields map[string]string) error { tmp, ok := fields["authorizerID"] if !ok { - return ackerrors.MissingNameIdentifier + return ackerrors.NewTerminalError(fmt.Errorf("required field missing: authorizerID")) } r.ko.Status.AuthorizerID = &tmp diff --git a/pkg/resource/deployment/resource.go b/pkg/resource/deployment/resource.go index 18e8393..0e5f004 100644 --- a/pkg/resource/deployment/resource.go +++ b/pkg/resource/deployment/resource.go @@ -16,6 +16,8 @@ package deployment 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" @@ -103,7 +105,7 @@ func (r *resource) SetIdentifiers(identifier *ackv1alpha1.AWSIdentifiers) error func (r *resource) PopulateResourceFromAnnotation(fields map[string]string) error { tmp, ok := fields["deploymentID"] if !ok { - return ackerrors.MissingNameIdentifier + return ackerrors.NewTerminalError(fmt.Errorf("required field missing: deploymentID")) } r.ko.Status.DeploymentID = &tmp diff --git a/pkg/resource/domain_name/resource.go b/pkg/resource/domain_name/resource.go index 89bc83c..bdf88a6 100644 --- a/pkg/resource/domain_name/resource.go +++ b/pkg/resource/domain_name/resource.go @@ -16,6 +16,8 @@ package domain_name 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["domainName"] if !ok { - return ackerrors.MissingNameIdentifier + return ackerrors.NewTerminalError(fmt.Errorf("required field missing: domainName")) } r.ko.Spec.DomainName = &tmp diff --git a/pkg/resource/integration/resource.go b/pkg/resource/integration/resource.go index 3ebc905..6bf6a5a 100644 --- a/pkg/resource/integration/resource.go +++ b/pkg/resource/integration/resource.go @@ -16,6 +16,8 @@ package integration 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" @@ -103,7 +105,7 @@ func (r *resource) SetIdentifiers(identifier *ackv1alpha1.AWSIdentifiers) error func (r *resource) PopulateResourceFromAnnotation(fields map[string]string) error { tmp, ok := fields["integrationID"] if !ok { - return ackerrors.MissingNameIdentifier + return ackerrors.NewTerminalError(fmt.Errorf("required field missing: integrationID")) } r.ko.Status.IntegrationID = &tmp diff --git a/pkg/resource/route/resource.go b/pkg/resource/route/resource.go index d3e5f5c..2985135 100644 --- a/pkg/resource/route/resource.go +++ b/pkg/resource/route/resource.go @@ -16,6 +16,8 @@ package route 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" @@ -103,7 +105,7 @@ func (r *resource) SetIdentifiers(identifier *ackv1alpha1.AWSIdentifiers) error func (r *resource) PopulateResourceFromAnnotation(fields map[string]string) error { tmp, ok := fields["routeID"] if !ok { - return ackerrors.MissingNameIdentifier + return ackerrors.NewTerminalError(fmt.Errorf("required field missing: routeID")) } r.ko.Status.RouteID = &tmp diff --git a/pkg/resource/stage/resource.go b/pkg/resource/stage/resource.go index db424c1..4ab845a 100644 --- a/pkg/resource/stage/resource.go +++ b/pkg/resource/stage/resource.go @@ -16,6 +16,8 @@ package stage 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" @@ -103,7 +105,7 @@ func (r *resource) SetIdentifiers(identifier *ackv1alpha1.AWSIdentifiers) error func (r *resource) PopulateResourceFromAnnotation(fields map[string]string) error { tmp, ok := fields["stageName"] if !ok { - return ackerrors.MissingNameIdentifier + return ackerrors.NewTerminalError(fmt.Errorf("required field missing: stageName")) } r.ko.Spec.StageName = &tmp diff --git a/pkg/resource/vpc_link/resource.go b/pkg/resource/vpc_link/resource.go index 55b861e..545536c 100644 --- a/pkg/resource/vpc_link/resource.go +++ b/pkg/resource/vpc_link/resource.go @@ -16,6 +16,8 @@ package vpc_link 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["vpcLinkID"] if !ok { - return ackerrors.MissingNameIdentifier + return ackerrors.NewTerminalError(fmt.Errorf("required field missing: vpcLinkID")) } r.ko.Status.VPCLinkID = &tmp