ACK runtime update to v0.19.0 (#81)

vijtrip2 · web-flow · commit 4a8d5f6f7ccd · 2022-06-14T10:03:23.000-07:00
Issue #, if available: aws-controllers-k8s/community#1337 Description of changes: * Update ACK runtime to v0.19.0 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2022-04-15T17:49:11Z"
-  build_hash: 50c64871bcaf88b9ee200eb8d6b8245fa8f675eb
+  build_date: "2022-06-14T04:07:34Z"
+  build_hash: a133935a9a93591a9e1ba9d5ca940cb83a1353b4
   go_version: go1.17.5
-  version: v0.18.4
+  version: v0.19.0
 api_directory_checksum: 129f62379684f764be26baaa8e217e0c431281e5
 api_version: v1alpha1
 aws_sdk_go_version: v1.42.0
 generator_config_info:
-  file_checksum: 22e3ba251f2c6dedc35cb65c70e8b5f80b523b0f
+  file_checksum: c8b1db51c97c92fd2a6929e4792d54f1a9cb603d
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -111,3 +111,5 @@ resources:
     list_operation:
       match_fields:
         - Name
+    tags:
+      path: Tagging.TagSet
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml
@@ -66,7 +66,7 @@ spec:
         - name: ACK_LOG_LEVEL
           value: "info"
         - name: ACK_RESOURCE_TAGS
-          value: "services.k8s.aws/managed=true,services.k8s.aws/created=%UTCNOW%,services.k8s.aws/namespace=%KUBERNETES_NAMESPACE%"
+          value: "services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%,services.k8s.aws/namespace=%K8S_NAMESPACE%"
         securityContext:
           allowPrivilegeEscalation: false
           privileged: false
diff --git 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: v0.1.0
+  newTag: v0.1.1
diff --git a/generator.yaml b/generator.yaml
@@ -111,3 +111,5 @@ resources:
     list_operation:
       match_fields:
         - Name
+    tags:
+      path: Tagging.TagSet
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/s3-controller
 go 1.17
 
 require (
-	github.com/aws-controllers-k8s/runtime v0.18.4
+	github.com/aws-controllers-k8s/runtime v0.19.0
 	github.com/aws/aws-sdk-go v1.42.0
 	github.com/go-logr/logr v1.2.0
 	github.com/pkg/errors v0.9.1
diff --git 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.4 h1:iwLYNwhbuiWZrHPoulGj75oT+alE91wCNkF1FUELiAw=
-github.com/aws-controllers-k8s/runtime v0.18.4/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
+github.com/aws-controllers-k8s/runtime v0.19.0 h1:+O5a6jBSBAd8XTNMrVCIYu4G+ZUPZe/G5eopVFO18Dc=
+github.com/aws-controllers-k8s/runtime v0.19.0/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
@@ -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: v0.1.0
-appVersion: v0.1.0
+version: v0.1.1
+appVersion: v0.1.1
 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/crds/services.k8s.aws_adoptedresources.yaml b/helm/crds/services.k8s.aws_adoptedresources.yaml
@@ -57,9 +57,8 @@ spec:
                     type: string
                 type: object
               kubernetes:
-                description: TargetKubernetesResource provides all the values necessary
-                  to identify a given ACK type and override any metadata values when
-                  creating a resource of that type.
+                description: ResourceWithMetadata provides the values necessary to
+                  create a Kubernetes resource and override any of its metadata values.
                 properties:
                   group:
                     type: string
diff --git 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:v0.1.0".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/s3-controller:v0.1.1".
 
 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
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/s3-controller
-  tag: v0.1.0
+  tag: v0.1.1
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -64,9 +64,8 @@ installScope: cluster
 resourceTags:
   # Configures the ACK service controller to always set key/value pairs tags on
   # resources that it manages.
-  - services.k8s.aws/managed=true
-  - services.k8s.aws/created=%UTCNOW%
-  - services.k8s.aws/namespace=%KUBERNETES_NAMESPACE%
+  - services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%
+  - services.k8s.aws/namespace=%K8S_NAMESPACE%
 
 serviceAccount:
   # Specifies whether a service account should be created
diff --git a/pkg/resource/bucket/manager.go b/pkg/resource/bucket/manager.go
diff --git a/pkg/resource/bucket/tags.go b/pkg/resource/bucket/tags.go
diff --git a/test/e2e/requirements.txt b/test/e2e/requirements.txt
@@ -1 +1 @@
-acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@cfcae865f4e199977de9957f33e3a6c24bf4d1a9
+acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@fe6fadc3e1437f2785155c21e27dac3fd8c74f9b
diff --git a/test/e2e/tests/test_bucket.py b/test/e2e/tests/test_bucket.py
@@ -26,6 +26,7 @@
 from acktest.k8s import resource as k8s
 from acktest.aws.identity import get_region
 from acktest import adoption as adoption
+from acktest import tags as tags
 from e2e import service_marker, CRD_GROUP, CRD_VERSION, load_s3_resource
 from e2e.replacement_values import REPLACEMENT_VALUES
 from e2e.bootstrap_resources import BootstrapResources, get_bootstrap_resources
@@ -310,7 +311,7 @@ def _update_assert_tagging(self, bucket: Bucket, s3_resource):
         tagging = latest.Tagging()
 
         desired = bucket.resource_data["spec"]["tagging"]["tagSet"]
-        latest = tagging.tag_set
+        latest = tags.clean(tagging.tag_set)
 
         for i in range(2):
             assert desired[i]["key"] == latest[i]["Key"]
