From 6da8b796a8c3c47abe6a610f2ce6ac350f941863 Mon Sep 17 00:00:00 2001 From: AWS Controllers for Kubernetes Bot <82905295+ack-bot@users.noreply.github.com> Date: Sat, 23 Jul 2022 06:09:29 -0700 Subject: [PATCH] Update to ACK runtime `v0.19.3`, code-generator `v0.19.3` (#36) ### 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.18` to `v0.0.19` Once this PR is merged, release `v0.0.19` will be automatically created for `iam-controller` **Please close this PR, if you do not want the new patch release for `iam-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building iam-controller ==== Copying common custom resource definitions into iam Building Kubernetes API objects for iam Generating deepcopy code for iam Generating custom resource definitions for iam Building service controller for iam Generating RBAC manifests for iam Running gofmt against generated code for iam Updating additional GitHub repository maintenance files ==== building iam-controller release artifacts ==== Building release artifacts for iam-v0.0.19 Generating common custom resource definitions Generating custom resource definitions for iam Generating RBAC manifests for iam ``` ---------- 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 | 6 +++--- 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/policy/sdk.go | 4 ++++ pkg/resource/role/sdk.go | 4 ++++ 10 files changed, 20 insertions(+), 12 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 90cf72c..6df2257 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-06-22T22:16:40Z" - build_hash: 4b54669d709a0eb2c1fab659e329060350a40e84 + build_date: "2022-07-22T20:33:25Z" + build_hash: 87477ae8ca8ac6ddb8c565bbd910cc7e30f55ed0 go_version: go1.17.5 - version: v0.19.2 + version: v0.19.3 api_directory_checksum: 7d8d584cdaec82ab61d867fc030cb9bb45ac706f api_version: v1alpha1 aws_sdk_go_version: v1.42.0 diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 7dfa360..1b2acbc 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/iam-controller - newTag: v0.0.18 + newTag: v0.0.19 diff --git a/go.mod b/go.mod index bccd803..f56a2d5 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/iam-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 3589adb..3ec4282 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 dc11ad0..75273d9 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: iam-chart description: A Helm chart for the ACK service controller for AWS Identity & Access Management (IAM) -version: v0.0.18 -appVersion: v0.0.18 +version: v0.0.19 +appVersion: v0.0.19 home: https://github.com/aws-controllers-k8s/iam-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 d0b1339..02cc99c 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/iam-controller:v0.0.18". +This chart deploys "public.ecr.aws/aws-controllers-k8s/iam-controller:v0.0.19". 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 c80422e..2d3555a 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 2091742..c79bcb0 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/iam-controller - tag: v0.0.18 + tag: v0.0.19 pullPolicy: IfNotPresent pullSecrets: [] diff --git a/pkg/resource/policy/sdk.go b/pkg/resource/policy/sdk.go index 47806e5..7ac5f48 100644 --- a/pkg/resource/policy/sdk.go +++ b/pkg/resource/policy/sdk.go @@ -18,6 +18,7 @@ package policy 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/iam" @@ -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/role/sdk.go b/pkg/resource/role/sdk.go index 3e7e231..bd719d9 100644 --- a/pkg/resource/role/sdk.go +++ b/pkg/resource/role/sdk.go @@ -18,6 +18,7 @@ package role 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/iam" @@ -45,6 +47,8 @@ var ( _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage _ = &reflect.Value{} + _ = fmt.Sprintf("") + _ = &ackrequeue.NoRequeue{} ) // sdkFind returns SDK-specific information about a supplied resource