Skip to content

Commit 2153e6d

Browse files
authored
Update ACK runtime to v0.16.5 (#67)
### Update ACK runtime to `v0.16.5` ---------- * ACK code-generator `v0.16.5` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.16.5) * ACK runtime `v0.16.5` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.16.5) ---------- NOTE: This PR increments the release version of service controller from `v0.0.11` to `v0.0.12` Once this PR is merged, release `v0.0.12` will be automatically created for `s3-controller` **Please close this PR, if you do not want the new patch release for `s3-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building s3-controller ==== Copying common custom resource definitions into s3 Building Kubernetes API objects for s3 Generating deepcopy code for s3 Generating custom resource definitions for s3 Building service controller for s3 Generating RBAC manifests for s3 Running gofmt against generated code for s3 Updating additional GitHub repository maintenance files ==== building s3-controller release artifacts ==== Building release artifacts for s3-v0.0.12 Generating common custom resource definitions Generating custom resource definitions for s3 Generating RBAC manifests for s3 ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent a348666 commit 2153e6d

19 files changed

+250
-142
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
ack_generate_info:
2-
build_date: "2022-01-24T21:01:57Z"
3-
build_hash: cccec82a27ddd880095383360df1fdc8f530842f
2+
build_date: "2022-02-08T20:21:43Z"
3+
build_hash: edec6dad2fbd530d615d01e96f5251a806e1f36d
44
go_version: go1.17.5
5-
version: v0.16.3
6-
api_directory_checksum: 3cc5d56eb9770025b494d6a41eb40f45e27cc9b1
5+
version: v0.16.5
6+
api_directory_checksum: fa2a65772afc6ff50671b1a5dff9712d53c87864
77
api_version: v1alpha1
8-
aws_sdk_go_version: v1.37.10
8+
aws_sdk_go_version: v1.42.0
99
generator_config_info:
1010
file_checksum: 22e3ba251f2c6dedc35cb65c70e8b5f80b523b0f
1111
original_file_name: generator.yaml

apis/v1alpha1/bucket.go

Lines changed: 8 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/enums.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/types.go

Lines changed: 52 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/zz_generated.deepcopy.go

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/controller/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ spec:
6161
drop:
6262
- ALL
6363
terminationGracePeriodSeconds: 10
64+
serviceAccountName: ack-s3-controller
6465
hostIPC: false
6566
hostNetwork: false
6667
hostPID: false

config/controller/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
55
kind: Kustomization
66
images:
77
- name: controller
8-
newName: ack-s3-controller
9-
newTag: latest
8+
newName: public.ecr.aws/aws-controllers-k8s/s3-controller
9+
newTag: v0.0.12

config/crd/bases/s3.services.k8s.aws_buckets.yaml

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ spec:
3636
spec:
3737
description: "BucketSpec defines the desired state of Bucket. \n In terms
3838
of implementation, a Bucket is a resource. An Amazon S3 bucket name
39-
is globally unique, and the namespace is shared by all AWS accounts."
39+
is globally unique, and the namespace is shared by all Amazon Web Services
40+
accounts."
4041
properties:
4142
accelerate:
4243
description: Container for setting the transfer acceleration state.
@@ -127,7 +128,7 @@ spec:
127128
description: Describes the cross-origin access configuration for objects
128129
in an Amazon S3 bucket. For more information, see Enabling Cross-Origin
129130
Resource Sharing (https://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html)
130-
in the Amazon Simple Storage Service Developer Guide.
131+
in the Amazon S3 User Guide.
131132
properties:
132133
corsRules:
133134
items:
@@ -150,6 +151,8 @@ spec:
150151
items:
151152
type: string
152153
type: array
154+
id:
155+
type: string
153156
maxAgeSeconds:
154157
format: int64
155158
type: integer
@@ -175,7 +178,7 @@ spec:
175178
request doesn't specify any server-side encryption, this
176179
default encryption will be applied. For more information,
177180
see PUT Bucket encryption (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTencryption.html)
178-
in the Amazon Simple Storage Service API Reference.
181+
in the Amazon S3 API Reference.
179182
properties:
180183
kmsMasterKeyID:
181184
type: string
@@ -198,8 +201,9 @@ spec:
198201
description: Allows grantee to read the bucket ACL.
199202
type: string
200203
grantWrite:
201-
description: Allows grantee to create, overwrite, and delete any object
202-
in the bucket.
204+
description: "Allows grantee to create new objects in the bucket.
205+
\n For the bucket and object owners of existing objects, also allows
206+
deletions and overwrites of those objects."
203207
type: string
204208
grantWriteACP:
205209
description: Allows grantee to write the ACL for the applicable bucket.
@@ -268,7 +272,7 @@ spec:
268272
items:
269273
description: Specifies the inventory configuration for an Amazon
270274
S3 bucket. For more information, see GET Bucket inventory (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETInventoryConfig.html)
271-
in the Amazon Simple Storage Service API Reference.
275+
in the Amazon S3 API Reference.
272276
properties:
273277
destination:
274278
description: Specifies the inventory configuration for an Amazon
@@ -342,7 +346,7 @@ spec:
342346
before permanently removing all parts of the upload. For
343347
more information, see Aborting Incomplete Multipart Uploads
344348
Using a Bucket Lifecycle Policy (https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html#mpu-abort-incomplete-mpu-lifecycle-config)
345-
in the Amazon Simple Storage Service Developer Guide.
349+
in the Amazon S3 User Guide.
346350
properties:
347351
daysAfterInitiation:
348352
format: int64
@@ -439,7 +443,7 @@ spec:
439443
specified storage class. For more information about
440444
Amazon S3 lifecycle configuration rules, see Transitioning
441445
Objects Using Amazon S3 Lifecycle (https://docs.aws.amazon.com/AmazonS3/latest/dev/lifecycle-transition-general-considerations.html)
442-
in the Amazon Simple Storage Service Developer Guide.
446+
in the Amazon S3 User Guide.
443447
properties:
444448
date:
445449
format: date-time
@@ -461,7 +465,7 @@ spec:
461465
description: Describes where logs are stored and the prefix that
462466
Amazon S3 assigns to all log object keys for a bucket. For more
463467
information, see PUT Bucket logging (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTlogging.html)
464-
in the Amazon Simple Storage Service API Reference.
468+
in the Amazon S3 API Reference.
465469
properties:
466470
targetBucket:
467471
type: string
@@ -499,22 +503,26 @@ spec:
499503
an Amazon S3 bucket. If you're updating an existing metrics configuration,
500504
note that this is a full replacement of the existing metrics configuration.
501505
If you don't include the elements you want to keep, they are erased.
502-
For more information, see PUT Bucket metrics (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTMetricConfiguration.html)
503-
in the Amazon Simple Storage Service API Reference.
506+
For more information, see PutBucketMetricsConfiguration (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTMetricConfiguration.html).
504507
properties:
505508
filter:
506509
description: Specifies a metrics configuration filter. The metrics
507510
configuration only includes objects that meet the filter's
508-
criteria. A filter must be a prefix, a tag, or a conjunction
509-
(MetricsAndOperator).
511+
criteria. A filter must be a prefix, an object tag, an access
512+
point ARN, or a conjunction (MetricsAndOperator). For more
513+
information, see PutBucketMetricsConfiguration (https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketMetricsConfiguration.html).
510514
properties:
515+
accessPointARN:
516+
type: string
511517
and:
512518
description: A conjunction (logical AND) of predicates,
513519
which is used in evaluating a metrics filter. The operator
514520
must have at least two predicates, and an object must
515521
match all of the predicates in order for the filter to
516522
apply.
517523
properties:
524+
accessPointARN:
525+
type: string
518526
prefix:
519527
type: string
520528
tags:
@@ -554,7 +562,7 @@ spec:
554562
lambdaFunctionConfigurations:
555563
items:
556564
description: A container for specifying the configuration for
557-
AWS Lambda notifications.
565+
Lambda notifications.
558566
properties:
559567
events:
560568
items:
@@ -564,7 +572,7 @@ spec:
564572
description: Specifies object key name filtering rules.
565573
For information about key name filtering, see Configuring
566574
Event Notifications (https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
567-
in the Amazon Simple Storage Service Developer Guide.
575+
in the Amazon S3 User Guide.
568576
properties:
569577
key:
570578
description: A container for object key name prefix
@@ -610,7 +618,7 @@ spec:
610618
description: Specifies object key name filtering rules.
611619
For information about key name filtering, see Configuring
612620
Event Notifications (https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
613-
in the Amazon Simple Storage Service Developer Guide.
621+
in the Amazon S3 User Guide.
614622
properties:
615623
key:
616624
description: A container for object key name prefix
@@ -656,7 +664,7 @@ spec:
656664
description: Specifies object key name filtering rules.
657665
For information about key name filtering, see Configuring
658666
Event Notifications (https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
659-
in the Amazon Simple Storage Service Developer Guide.
667+
in the Amazon S3 User Guide.
660668
properties:
661669
key:
662670
description: A container for object key name prefix
@@ -723,7 +731,7 @@ spec:
723731
options in any combination. For more information about when Amazon
724732
S3 considers a bucket or object public, see The Meaning of "Public"
725733
(https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status)
726-
in the Amazon Simple Storage Service Developer Guide.
734+
in the Amazon S3 User Guide.
727735
properties:
728736
blockPublicACLs:
729737
type: boolean
@@ -831,7 +839,7 @@ spec:
831839
description: Optional configuration to replicate existing
832840
source bucket objects. For more information, see Replicating
833841
Existing Objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-what-is-isnot-replicated.html#existing-object-replication)
834-
in the Amazon S3 Developer Guide.
842+
in the Amazon S3 User Guide.
835843
properties:
836844
status:
837845
type: string
@@ -849,7 +857,7 @@ spec:
849857
\n * If you specify both a Prefix and a Tag filter,
850858
wrap these filters in an And tag. \n * If you
851859
specify a filter based on multiple tags, wrap the
852-
Tag elements in an And tag"
860+
Tag elements in an And tag."
853861
properties:
854862
prefix:
855863
type: string
@@ -888,8 +896,8 @@ spec:
888896
You can choose to enable or disable the replication of
889897
these objects. Currently, Amazon S3 supports only the
890898
filter that you can specify for objects created with server-side
891-
encryption using a customer master key (CMK) stored in
892-
AWS Key Management Service (SSE-KMS).
899+
encryption using a customer managed key stored in Amazon
900+
Web Services Key Management Service (SSE-KMS).
893901
properties:
894902
replicaModifications:
895903
description: "A filter that you can specify for selection
@@ -908,7 +916,8 @@ spec:
908916
type: object
909917
sseKMSEncryptedObjects:
910918
description: A container for filter information for
911-
the selection of S3 objects encrypted with AWS KMS.
919+
the selection of S3 objects encrypted with Amazon
920+
Web Services KMS.
912921
properties:
913922
status:
914923
type: string
@@ -974,7 +983,7 @@ spec:
974983
description: Specifies the redirect behavior and when a redirect
975984
is applied. For more information about routing rules, see
976985
Configuring advanced conditional redirects (https://docs.aws.amazon.com/AmazonS3/latest/dev/how-to-page-redirect.html#advanced-conditional-redirects)
977-
in the Amazon Simple Storage Service Developer Guide.
986+
in the Amazon S3 User Guide.
978987
properties:
979988
condition:
980989
description: A container for describing a condition that

config/rbac/cluster-role-binding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ roleRef:
88
name: ack-s3-controller
99
subjects:
1010
- kind: ServiceAccount
11-
name: default
11+
name: ack-s3-controller
1212
namespace: ack-system

config/rbac/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ resources:
33
- cluster-role-controller.yaml
44
- role-reader.yaml
55
- role-writer.yaml
6+
- service-account.yaml
7+

config/rbac/service-account.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
apiVersion: v1
3+
kind: ServiceAccount
4+
metadata:
5+
name: ack-s3-controller
6+
namespace: ack-system

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/aws-controllers-k8s/s3-controller
33
go 1.17
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.16.3
7-
github.com/aws/aws-sdk-go v1.37.10
6+
github.com/aws-controllers-k8s/runtime v0.16.5
7+
github.com/aws/aws-sdk-go v1.42.0
88
github.com/go-logr/logr v1.2.0
99
github.com/spf13/pflag v1.0.5
1010
github.com/stretchr/testify v1.7.0

0 commit comments

Comments
 (0)