From 9867f34c7b4ef92f1a9be24ae2dcd5d0ed5b5398 Mon Sep 17 00:00:00 2001 From: AWS Controllers for Kubernetes Bot <82905295+ack-bot@users.noreply.github.com> Date: Thu, 11 May 2023 13:44:59 -0600 Subject: [PATCH] Update to ACK runtime `v0.26.0`, code-generator `v0.26.0` (#150) ### Update to ACK runtime `v0.26.0`, code-generator `v0.26.0` ---------- * ACK code-generator `v0.26.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.26.0) * ACK runtime `v0.26.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.26.0) ---------- NOTE: This PR increments the release version of service controller from `v1.1.2` to `v1.1.3` Once this PR is merged, release `v1.1.3` will be automatically created for `rds-controller` **Please close this PR, if you do not want the new patch release for `rds-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building rds-controller ==== Copying common custom resource definitions into rds Building Kubernetes API objects for rds Generating deepcopy code for rds Generating custom resource definitions for rds Building service controller for rds Generating RBAC manifests for rds Running gofmt against generated code for rds Updating additional GitHub repository maintenance files ==== building rds-controller release artifacts ==== Building release artifacts for rds-v1.1.3 Generating common custom resource definitions Generating custom resource definitions for rds Generating RBAC manifests for rds ``` ---------- 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 ++++---- cmd/controller/main.go | 9 ++++++++- config/controller/kustomization.yaml | 2 +- helm/Chart.yaml | 4 ++-- helm/crds/services.k8s.aws_adoptedresources.yaml | 5 ++++- helm/templates/NOTES.txt | 2 +- helm/values.yaml | 2 +- 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index c795260..b80938f 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2023-05-01T15:29:03Z" - build_hash: e69321ed2d9567bf2d439af970b7466086f0b4fa - go_version: go1.19.4 - version: v0.25.0-6-ge69321e + build_date: "2023-05-01T22:38:52Z" + build_hash: 6657565bb742e5cd4cd340d01d5e4786b5fbabc0 + go_version: go1.19 + version: v0.26.0 api_directory_checksum: b3f33aebf366349bde7945f7b627ae788a18c0d5 api_version: v1alpha1 aws_sdk_go_version: v1.44.232 diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 5ad467b..21d7204 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -29,6 +29,7 @@ import ( svcsdk "github.com/aws/aws-sdk-go/service/rds" flag "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrlrt "sigs.k8s.io/controller-runtime" ctrlrtmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" @@ -70,7 +71,13 @@ func main() { flag.Parse() ackCfg.SetupLogger() - if err := ackCfg.Validate(); err != nil { + managerFactories := svcresource.GetManagerFactories() + resourceGVKs := make([]schema.GroupVersionKind, 0, len(managerFactories)) + for _, mf := range managerFactories { + resourceGVKs = append(resourceGVKs, mf.ResourceDescriptor().GroupVersionKind()) + } + + if err := ackCfg.Validate(ackcfg.WithGVKs(resourceGVKs)); err != nil { setupLog.Error( err, "Unable to create controller manager", "aws.service", awsServiceAlias, diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 534a12a..e079226 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/rds-controller - newTag: v1.1.2 + newTag: v1.1.3 diff --git a/helm/Chart.yaml b/helm/Chart.yaml index d898b3d..8612e34 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: rds-chart description: A Helm chart for the ACK service controller for Amazon Relational Database Service (RDS) -version: v1.1.2 -appVersion: v1.1.2 +version: v1.1.3 +appVersion: v1.1.3 home: https://github.com/aws-controllers-k8s/rds-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/crds/services.k8s.aws_adoptedresources.yaml b/helm/crds/services.k8s.aws_adoptedresources.yaml index 7dca541..d8d5126 100644 --- a/helm/crds/services.k8s.aws_adoptedresources.yaml +++ b/helm/crds/services.k8s.aws_adoptedresources.yaml @@ -145,7 +145,10 @@ spec: blockOwnerDeletion: description: If true, AND if the owner has the "foregroundDeletion" finalizer, then the owner cannot be deleted from the - key-value store until this reference is removed. Defaults + key-value store until this reference is removed. See + https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion + for how the garbage collector interacts with this + field and enforces the foreground deletion. Defaults to false. To set this field, a user needs "delete" permission of the owner, otherwise 422 (Unprocessable Entity) will be returned. diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index 1f6fd47..78ac14a 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/rds-controller:v1.1.2". +This chart deploys "public.ecr.aws/aws-controllers-k8s/rds-controller:v1.1.3". 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 deddcdb..734aa15 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/rds-controller - tag: v1.1.2 + tag: v1.1.3 pullPolicy: IfNotPresent pullSecrets: []