diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index f951f1d..bd6d50d 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-02-17T21:07:14Z" - build_hash: 11e0a33c63d0cfcd43042d8f8d07466fc1814135 - go_version: go1.24.0 - version: v0.42.0-2-g11e0a33 + build_date: "2025-02-18T00:59:10Z" + build_hash: 66c0f840b0bcf6f552be46cf5ee0fb95ad57053e + go_version: go1.23.6 + version: v0.43.0 api_directory_checksum: 12d59cc27a5fc11bf285d7735d81240e980b1046 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 08d0388..d6ff376 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/s3-controller - newTag: 1.0.22 + newTag: 1.0.23 diff --git a/helm/Chart.yaml b/helm/Chart.yaml index fa8a459..becb130 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: s3-chart description: A Helm chart for the ACK service controller for Amazon Simple Storage Service (S3) -version: 1.0.22 -appVersion: 1.0.22 +version: 1.0.23 +appVersion: 1.0.23 home: https://github.com/aws-controllers-k8s/s3-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 d3f52a4..fa27022 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/s3-controller:1.0.22". +This chart deploys "public.ecr.aws/aws-controllers-k8s/s3-controller:1.0.23". 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 c4f7748..1bc45de 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/s3-controller - tag: 1.0.22 + tag: 1.0.23 pullPolicy: IfNotPresent pullSecrets: [] diff --git a/pkg/resource/bucket/manager.go b/pkg/resource/bucket/manager.go index 0b8d879..088dfcf 100644 --- a/pkg/resource/bucket/manager.go +++ b/pkg/resource/bucket/manager.go @@ -319,7 +319,7 @@ func (rm *resourceManager) FilterSystemTags(res acktypes.AWSResource) { } existingTags = r.ko.Spec.Tagging.TagSet resourceTags := ToACKTags(existingTags) - ignoreAWSTags(resourceTags) + ignoreSystemTags(resourceTags) r.ko.Spec.Tagging = &svcapitypes.Tagging{} r.ko.Spec.Tagging.TagSet = FromACKTags(resourceTags) } diff --git a/pkg/resource/bucket/tags.go b/pkg/resource/bucket/tags.go index f384f17..c74b386 100644 --- a/pkg/resource/bucket/tags.go +++ b/pkg/resource/bucket/tags.go @@ -66,12 +66,11 @@ func FromACKTags(tags acktags.Tags) []*svcapitypes.Tag { return result } -// ignoreAWSTags ignores tags that have keys that start with "aws:" -// is needed to ensure the controller does not attempt to remove -// tags set by AWS +// ignoreSystemTags ignores tags that have keys that start with "aws:" +// and ACKSystemTags, to avoid patching them to the resourceSpec. // Eg. resources created with cloudformation have tags that cannot be // removed by an ACK controller -func ignoreAWSTags(tags acktags.Tags) { +func ignoreSystemTags(tags acktags.Tags) { for k := range tags { if strings.HasPrefix(k, "aws:") || slices.Contains(ACKSystemTags, k) {