From 7ba902cc39dfa53c6b474b6a334df6c60d18e05c Mon Sep 17 00:00:00 2001 From: AWS Controllers for Kubernetes Bot <82905295+ack-bot@users.noreply.github.com> Date: Mon, 25 Jul 2022 09:30:32 -0700 Subject: [PATCH] Update to ACK runtime `v0.19.3`, code-generator `v0.19.3` (#62) ### Update to ACK runtime `v0.19.3`, code-generator `v0.19.3` ---------- * ACK code-generator `v0.19.3` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.19.3) * ACK runtime `v0.19.3` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.19.3) ---------- NOTE: This PR increments the release version of service controller from `v0.0.16` to `v0.0.17` Once this PR is merged, release `v0.0.17` will be automatically created for `ec2-controller` **Please close this PR, if you do not want the new patch release for `ec2-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building ec2-controller ==== Copying common custom resource definitions into ec2 Building Kubernetes API objects for ec2 Generating deepcopy code for ec2 Generating custom resource definitions for ec2 Building service controller for ec2 Generating RBAC manifests for ec2 Running gofmt against generated code for ec2 Updating additional GitHub repository maintenance files ==== building ec2-controller release artifacts ==== Building release artifacts for ec2-v0.0.17 Generating common custom resource definitions Generating custom resource definitions for ec2 Generating RBAC manifests for ec2 ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --- 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.schema.json | 2 +- helm/values.yaml | 2 +- pkg/resource/dhcp_options/sdk.go | 4 ++++ pkg/resource/elastic_ip_address/sdk.go | 4 ++++ pkg/resource/instance/sdk.go | 4 ++++ pkg/resource/internet_gateway/sdk.go | 4 ++++ pkg/resource/nat_gateway/sdk.go | 4 ++++ pkg/resource/route_table/sdk.go | 4 ++++ pkg/resource/security_group/sdk.go | 4 ++++ pkg/resource/subnet/sdk.go | 4 ++++ pkg/resource/transit_gateway/sdk.go | 4 ++++ pkg/resource/vpc/sdk.go | 4 ++++ pkg/resource/vpc_endpoint/sdk.go | 4 ++++ 19 files changed, 57 insertions(+), 13 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index fb7ea319..580c1152 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-07-22T19:16:29Z" - build_hash: 208b1e15257d57c46729698f47a40fd59441ecbd - go_version: go1.18.3 - version: v0.19.2-1-g208b1e1 + build_date: "2022-07-22T20:12:33Z" + build_hash: 87477ae8ca8ac6ddb8c565bbd910cc7e30f55ed0 + go_version: go1.17.5 + version: v0.19.3 api_directory_checksum: 8c35bdcab21768638dfaa277896e05fdd8a11969 api_version: v1alpha1 aws_sdk_go_version: v1.42.0 diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 619433ba..d02adaa7 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/ec2-controller - newTag: v0.0.16 + newTag: v0.0.17 diff --git a/go.mod b/go.mod index 3d5e6619..3c698ad7 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/ec2-controller go 1.17 require ( - github.com/aws-controllers-k8s/runtime v0.19.2 + github.com/aws-controllers-k8s/runtime v0.19.3 github.com/aws/aws-sdk-go v1.42.0 github.com/go-logr/logr v1.2.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 19641686..8c797f84 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.19.2 h1:Oar0P5eIIXlA+DolGwurw2+wyY5j+d/dxbisZTsrRLw= -github.com/aws-controllers-k8s/runtime v0.19.2/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU= +github.com/aws-controllers-k8s/runtime v0.19.3 h1:difFG8eFrQuIZb+FGEKMLrGlhY/QwKq++W33oMg+c3Q= +github.com/aws-controllers-k8s/runtime v0.19.3/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= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 686ea574..33009826 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: ec2-chart description: A Helm chart for the ACK service controller for Amazon Elastic Cloud Compute (EC2) -version: v0.0.16 -appVersion: v0.0.16 +version: v0.0.17 +appVersion: v0.0.17 home: https://github.com/aws-controllers-k8s/ec2-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 cbbb575c..db38eadc 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/ec2-controller:v0.0.16". +This chart deploys "public.ecr.aws/aws-controllers-k8s/ec2-controller:v0.0.17". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/helm/values.schema.json b/helm/values.schema.json index c80422e6..2d3555a6 100644 --- a/helm/values.schema.json +++ b/helm/values.schema.json @@ -192,7 +192,7 @@ "type": "array", "items": { "type": "string", - "pattern": "^.*=.*$" + "pattern": "(^$|^.*=.*$)" } }, "serviceAccount": { diff --git a/helm/values.yaml b/helm/values.yaml index b6d722eb..828a1076 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/ec2-controller - tag: v0.0.16 + tag: v0.0.17 pullPolicy: IfNotPresent pullSecrets: [] diff --git a/pkg/resource/dhcp_options/sdk.go b/pkg/resource/dhcp_options/sdk.go index 7a838f66..d392e968 100644 --- a/pkg/resource/dhcp_options/sdk.go +++ b/pkg/resource/dhcp_options/sdk.go @@ -18,6 +18,7 @@ package dhcp_options import ( "context" "errors" + "fmt" "reflect" "strings" @@ -25,6 +26,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go/aws" svcsdk "github.com/aws/aws-sdk-go/service/ec2" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/elastic_ip_address/sdk.go b/pkg/resource/elastic_ip_address/sdk.go index 9eead6fd..1e0fe2cd 100644 --- a/pkg/resource/elastic_ip_address/sdk.go +++ b/pkg/resource/elastic_ip_address/sdk.go @@ -18,6 +18,7 @@ package elastic_ip_address import ( "context" "errors" + "fmt" "reflect" "strings" @@ -25,6 +26,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go/aws" svcsdk "github.com/aws/aws-sdk-go/service/ec2" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/instance/sdk.go b/pkg/resource/instance/sdk.go index 403ae8b7..0b2889d3 100644 --- a/pkg/resource/instance/sdk.go +++ b/pkg/resource/instance/sdk.go @@ -18,6 +18,7 @@ package instance import ( "context" "errors" + "fmt" "reflect" "strings" @@ -25,6 +26,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go/aws" svcsdk "github.com/aws/aws-sdk-go/service/ec2" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/internet_gateway/sdk.go b/pkg/resource/internet_gateway/sdk.go index f63df35a..d1dd9fb4 100644 --- a/pkg/resource/internet_gateway/sdk.go +++ b/pkg/resource/internet_gateway/sdk.go @@ -18,6 +18,7 @@ package internet_gateway import ( "context" "errors" + "fmt" "reflect" "strings" @@ -25,6 +26,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go/aws" svcsdk "github.com/aws/aws-sdk-go/service/ec2" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/nat_gateway/sdk.go b/pkg/resource/nat_gateway/sdk.go index 182183e3..115880f2 100644 --- a/pkg/resource/nat_gateway/sdk.go +++ b/pkg/resource/nat_gateway/sdk.go @@ -18,6 +18,7 @@ package nat_gateway import ( "context" "errors" + "fmt" "reflect" "strings" @@ -25,6 +26,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go/aws" svcsdk "github.com/aws/aws-sdk-go/service/ec2" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/route_table/sdk.go b/pkg/resource/route_table/sdk.go index 0af3aa30..b75ac78c 100644 --- a/pkg/resource/route_table/sdk.go +++ b/pkg/resource/route_table/sdk.go @@ -18,6 +18,7 @@ package route_table import ( "context" "errors" + "fmt" "reflect" "strings" @@ -25,6 +26,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go/aws" svcsdk "github.com/aws/aws-sdk-go/service/ec2" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/security_group/sdk.go b/pkg/resource/security_group/sdk.go index 31d42220..0a77025a 100644 --- a/pkg/resource/security_group/sdk.go +++ b/pkg/resource/security_group/sdk.go @@ -18,6 +18,7 @@ package security_group import ( "context" "errors" + "fmt" "reflect" "strings" @@ -25,6 +26,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go/aws" svcsdk "github.com/aws/aws-sdk-go/service/ec2" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/subnet/sdk.go b/pkg/resource/subnet/sdk.go index 19997152..b460b926 100644 --- a/pkg/resource/subnet/sdk.go +++ b/pkg/resource/subnet/sdk.go @@ -18,6 +18,7 @@ package subnet import ( "context" "errors" + "fmt" "reflect" "strings" @@ -25,6 +26,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go/aws" svcsdk "github.com/aws/aws-sdk-go/service/ec2" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/transit_gateway/sdk.go b/pkg/resource/transit_gateway/sdk.go index 0b8094ee..5c41ba3f 100644 --- a/pkg/resource/transit_gateway/sdk.go +++ b/pkg/resource/transit_gateway/sdk.go @@ -18,6 +18,7 @@ package transit_gateway import ( "context" "errors" + "fmt" "reflect" "strings" @@ -25,6 +26,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go/aws" svcsdk "github.com/aws/aws-sdk-go/service/ec2" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/vpc/sdk.go b/pkg/resource/vpc/sdk.go index 57204fcc..49a5491c 100644 --- a/pkg/resource/vpc/sdk.go +++ b/pkg/resource/vpc/sdk.go @@ -18,6 +18,7 @@ package vpc import ( "context" "errors" + "fmt" "reflect" "strings" @@ -25,6 +26,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go/aws" svcsdk "github.com/aws/aws-sdk-go/service/ec2" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/vpc_endpoint/sdk.go b/pkg/resource/vpc_endpoint/sdk.go index b440cb32..5bcde914 100644 --- a/pkg/resource/vpc_endpoint/sdk.go +++ b/pkg/resource/vpc_endpoint/sdk.go @@ -18,6 +18,7 @@ package vpc_endpoint import ( "context" "errors" + "fmt" "reflect" "strings" @@ -25,6 +26,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" "github.com/aws/aws-sdk-go/aws" svcsdk "github.com/aws/aws-sdk-go/service/ec2" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource