From 5257656d228ba364767db3215d278903e7353de1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 15 Apr 2022 17:17:29 +0000 Subject: [PATCH] Update to ACK runtime `v0.18.4`, code-generator `v0.18.4` --- apis/v1alpha1/ack-generate-metadata.yaml | 6 +++--- cmd/controller/main.go | 10 ++++++++-- config/controller/kustomization.yaml | 2 +- go.mod | 3 ++- go.sum | 6 ++++-- helm/Chart.yaml | 4 ++-- helm/templates/NOTES.txt | 2 +- helm/values.yaml | 2 +- pkg/resource/repository/sdk.go | 7 ++++--- 9 files changed, 26 insertions(+), 16 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 5e88a62..ffc25a1 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2022-03-31T20:38:06Z" - build_hash: c4516f46370293aa38f56d01393b7216f5902886 + build_date: "2022-04-15T17:17:20Z" + build_hash: 50c64871bcaf88b9ee200eb8d6b8245fa8f675eb go_version: go1.17.5 - version: v0.18.2 + version: v0.18.4 api_directory_checksum: deb6d526537cf2d0a956eb58ceeb430de3eddab5 api_version: v1alpha1 aws_sdk_go_version: v1.42.0 diff --git a/cmd/controller/main.go b/cmd/controller/main.go index e42292d..087f0bd 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -18,6 +18,7 @@ package main import ( "os" + ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" ackcfg "github.com/aws-controllers-k8s/runtime/pkg/config" ackrt "github.com/aws-controllers-k8s/runtime/pkg/runtime" ackrtutil "github.com/aws-controllers-k8s/runtime/pkg/util" @@ -31,9 +32,10 @@ import ( svctypes "github.com/aws-controllers-k8s/ecr-controller/apis/v1alpha1" svcresource "github.com/aws-controllers-k8s/ecr-controller/pkg/resource" - ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" _ "github.com/aws-controllers-k8s/ecr-controller/pkg/resource/repository" + + "github.com/aws-controllers-k8s/ecr-controller/pkg/version" ) var ( @@ -99,7 +101,11 @@ func main() { ) sc := ackrt.NewServiceController( awsServiceAlias, awsServiceAPIGroup, awsServiceEndpointsID, - ackrt.VersionInfo{}, // TODO: populate version info + ackrt.VersionInfo{ + version.GitCommit, + version.GitVersion, + version.BuildDate, + }, ).WithLogger( ctrlrt.Log, ).WithResourceManagerFactories( diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index eff2549..f51c900 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: v0.0.26 + newTag: v0.0.27 diff --git a/go.mod b/go.mod index 58e9c40..96797c8 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/ecr-controller go 1.17 require ( - github.com/aws-controllers-k8s/runtime v0.18.1 + github.com/aws-controllers-k8s/runtime v0.18.4 github.com/aws/aws-sdk-go v1.42.0 github.com/go-logr/logr v1.2.0 github.com/spf13/pflag v1.0.5 @@ -15,6 +15,7 @@ require ( require ( github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.2 // indirect github.com/cespare/xxhash/v2 v2.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect diff --git a/go.sum b/go.sum index 5779d96..db2f6c3 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/aws-controllers-k8s/runtime v0.18.1 h1:eHmW7ObuGqnz/QpOKnZqHY2QuZmk8uROyXOvqKc7WjY= -github.com/aws-controllers-k8s/runtime v0.18.1/go.mod h1:pK+LlQRxxWKC9mRHnGz8/WRI8Dcvjg4ZGmK8rVwb51Y= +github.com/aws-controllers-k8s/runtime v0.18.4 h1:iwLYNwhbuiWZrHPoulGj75oT+alE91wCNkF1FUELiAw= +github.com/aws-controllers-k8s/runtime v0.18.4/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU= github.com/aws/aws-sdk-go v1.42.0 h1:BMZws0t8NAhHFsfnT3B40IwD13jVDG5KerlRksctVIw= github.com/aws/aws-sdk-go v1.42.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= @@ -79,6 +79,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= +github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 12cd447..ebd3b5b 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: v0.0.26 -appVersion: v0.0.26 +version: v0.0.27 +appVersion: v0.0.27 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 ddbba56..c9d1531 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:v0.0.26". +This chart deploys "public.ecr.aws/aws-controllers-k8s/ecr-controller:v0.0.27". 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 ccf5ec4..28d72fa 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/ecr-controller - tag: v0.0.26 + tag: v0.0.27 pullPolicy: IfNotPresent pullSecrets: [] diff --git a/pkg/resource/repository/sdk.go b/pkg/resource/repository/sdk.go index 79a8078..e22e37f 100644 --- a/pkg/resource/repository/sdk.go +++ b/pkg/resource/repository/sdk.go @@ -17,6 +17,7 @@ package repository import ( "context" + "errors" "reflect" "strings" @@ -408,8 +409,8 @@ func (rm *resourceManager) updateConditions( syncCondition = condition } } - - if rm.terminalAWSError(err) || err == ackerr.SecretTypeNotSupported || err == ackerr.SecretNotFound { + var termError *ackerr.TerminalError + if rm.terminalAWSError(err) || err == ackerr.SecretTypeNotSupported || err == ackerr.SecretNotFound || errors.As(err, &termError) { if terminalCondition == nil { terminalCondition = &ackv1alpha1.Condition{ Type: ackv1alpha1.ConditionTypeTerminal, @@ -417,7 +418,7 @@ func (rm *resourceManager) updateConditions( ko.Status.Conditions = append(ko.Status.Conditions, terminalCondition) } var errorMessage = "" - if err == ackerr.SecretTypeNotSupported || err == ackerr.SecretNotFound { + if err == ackerr.SecretTypeNotSupported || err == ackerr.SecretNotFound || errors.As(err, &termError) { errorMessage = err.Error() } else { awsErr, _ := ackerr.AWSError(err)