Skip to content

Commit

Permalink
Update ACK runtime to v0.16.5 (#67)
Browse files Browse the repository at this point in the history 
### 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.
  • Loading branch information
@ack-bot
ack-bot committed Feb 8, 2022
1 parent a348666 commit 2153e6d
Show file tree
Hide file tree
Showing 19 changed files with 250 additions and 142 deletions.
10 changes: 5 additions & 5 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
@@ -1,11 +1,11 @@
ack_generate_info:
build_date: "2022-01-24T21:01:57Z"
build_hash: cccec82a27ddd880095383360df1fdc8f530842f
build_date: "2022-02-08T20:21:43Z"
build_hash: edec6dad2fbd530d615d01e96f5251a806e1f36d
go_version: go1.17.5
version: v0.16.3
api_directory_checksum: 3cc5d56eb9770025b494d6a41eb40f45e27cc9b1
version: v0.16.5
api_directory_checksum: fa2a65772afc6ff50671b1a5dff9712d53c87864
api_version: v1alpha1
aws_sdk_go_version: v1.37.10
aws_sdk_go_version: v1.42.0
generator_config_info:
file_checksum: 22e3ba251f2c6dedc35cb65c70e8b5f80b523b0f
original_file_name: generator.yaml
Expand Down
12 changes: 8 additions & 4 deletions apis/v1alpha1/bucket.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/v1alpha1/enums.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

92 changes: 52 additions & 40 deletions apis/v1alpha1/types.go
View file

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions apis/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions config/controller/deployment.yaml
View file
Expand Up @@ -61,6 +61,7 @@ spec:
drop:
- ALL
terminationGracePeriodSeconds: 10
serviceAccountName: ack-s3-controller
hostIPC: false
hostNetwork: false
hostPID: false
4 changes: 2 additions & 2 deletions config/controller/kustomization.yaml
View file
Expand Up @@ -5,5 +5,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: ack-s3-controller
newTag: latest
newName: public.ecr.aws/aws-controllers-k8s/s3-controller
newTag: v0.0.12
57 changes: 33 additions & 24 deletions config/crd/bases/s3.services.k8s.aws_buckets.yaml
View file
Expand Up @@ -36,7 +36,8 @@ spec:
spec:
description: "BucketSpec defines the desired state of Bucket. \n In terms
of implementation, a Bucket is a resource. An Amazon S3 bucket name
is globally unique, and the namespace is shared by all AWS accounts."
is globally unique, and the namespace is shared by all Amazon Web Services
accounts."
properties:
accelerate:
description: Container for setting the transfer acceleration state.
Expand Down Expand Up @@ -127,7 +128,7 @@ spec:
description: Describes the cross-origin access configuration for objects
in an Amazon S3 bucket. For more information, see Enabling Cross-Origin
Resource Sharing (https://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html)
in the Amazon Simple Storage Service Developer Guide.
in the Amazon S3 User Guide.
properties:
corsRules:
items:
Expand All @@ -150,6 +151,8 @@ spec:
items:
type: string
type: array
id:
type: string
maxAgeSeconds:
format: int64
type: integer
Expand All @@ -175,7 +178,7 @@ spec:
request doesn't specify any server-side encryption, this
default encryption will be applied. For more information,
see PUT Bucket encryption (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTencryption.html)
in the Amazon Simple Storage Service API Reference.
in the Amazon S3 API Reference.
properties:
kmsMasterKeyID:
type: string
Expand All @@ -198,8 +201,9 @@ spec:
description: Allows grantee to read the bucket ACL.
type: string
grantWrite:
description: Allows grantee to create, overwrite, and delete any object
in the bucket.
description: "Allows grantee to create new objects in the bucket.
\n For the bucket and object owners of existing objects, also allows
deletions and overwrites of those objects."
type: string
grantWriteACP:
description: Allows grantee to write the ACL for the applicable bucket.
Expand Down Expand Up @@ -268,7 +272,7 @@ spec:
items:
description: Specifies the inventory configuration for an Amazon
S3 bucket. For more information, see GET Bucket inventory (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETInventoryConfig.html)
in the Amazon Simple Storage Service API Reference.
in the Amazon S3 API Reference.
properties:
destination:
description: Specifies the inventory configuration for an Amazon
Expand Down Expand Up @@ -342,7 +346,7 @@ spec:
before permanently removing all parts of the upload. For
more information, see Aborting Incomplete Multipart Uploads
Using a Bucket Lifecycle Policy (https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html#mpu-abort-incomplete-mpu-lifecycle-config)
in the Amazon Simple Storage Service Developer Guide.
in the Amazon S3 User Guide.
properties:
daysAfterInitiation:
format: int64
Expand Down Expand Up @@ -439,7 +443,7 @@ spec:
specified storage class. For more information about
Amazon S3 lifecycle configuration rules, see Transitioning
Objects Using Amazon S3 Lifecycle (https://docs.aws.amazon.com/AmazonS3/latest/dev/lifecycle-transition-general-considerations.html)
in the Amazon Simple Storage Service Developer Guide.
in the Amazon S3 User Guide.
properties:
date:
format: date-time
Expand All @@ -461,7 +465,7 @@ spec:
description: Describes where logs are stored and the prefix that
Amazon S3 assigns to all log object keys for a bucket. For more
information, see PUT Bucket logging (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTlogging.html)
in the Amazon Simple Storage Service API Reference.
in the Amazon S3 API Reference.
properties:
targetBucket:
type: string
Expand Down Expand Up @@ -499,22 +503,26 @@ spec:
an Amazon S3 bucket. If you're updating an existing metrics configuration,
note that this is a full replacement of the existing metrics configuration.
If you don't include the elements you want to keep, they are erased.
For more information, see PUT Bucket metrics (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTMetricConfiguration.html)
in the Amazon Simple Storage Service API Reference.
For more information, see PutBucketMetricsConfiguration (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTMetricConfiguration.html).
properties:
filter:
description: Specifies a metrics configuration filter. The metrics
configuration only includes objects that meet the filter's
criteria. A filter must be a prefix, a tag, or a conjunction
(MetricsAndOperator).
criteria. A filter must be a prefix, an object tag, an access
point ARN, or a conjunction (MetricsAndOperator). For more
information, see PutBucketMetricsConfiguration (https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketMetricsConfiguration.html).
properties:
accessPointARN:
type: string
and:
description: A conjunction (logical AND) of predicates,
which is used in evaluating a metrics filter. The operator
must have at least two predicates, and an object must
match all of the predicates in order for the filter to
apply.
properties:
accessPointARN:
type: string
prefix:
type: string
tags:
Expand Down Expand Up @@ -554,7 +562,7 @@ spec:
lambdaFunctionConfigurations:
items:
description: A container for specifying the configuration for
AWS Lambda notifications.
Lambda notifications.
properties:
events:
items:
Expand All @@ -564,7 +572,7 @@ spec:
description: Specifies object key name filtering rules.
For information about key name filtering, see Configuring
Event Notifications (https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
in the Amazon Simple Storage Service Developer Guide.
in the Amazon S3 User Guide.
properties:
key:
description: A container for object key name prefix
Expand Down Expand Up @@ -610,7 +618,7 @@ spec:
description: Specifies object key name filtering rules.
For information about key name filtering, see Configuring
Event Notifications (https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
in the Amazon Simple Storage Service Developer Guide.
in the Amazon S3 User Guide.
properties:
key:
description: A container for object key name prefix
Expand Down Expand Up @@ -656,7 +664,7 @@ spec:
description: Specifies object key name filtering rules.
For information about key name filtering, see Configuring
Event Notifications (https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
in the Amazon Simple Storage Service Developer Guide.
in the Amazon S3 User Guide.
properties:
key:
description: A container for object key name prefix
Expand Down Expand Up @@ -723,7 +731,7 @@ spec:
options in any combination. For more information about when Amazon
S3 considers a bucket or object public, see The Meaning of "Public"
(https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status)
in the Amazon Simple Storage Service Developer Guide.
in the Amazon S3 User Guide.
properties:
blockPublicACLs:
type: boolean
Expand Down Expand Up @@ -831,7 +839,7 @@ spec:
description: Optional configuration to replicate existing
source bucket objects. For more information, see Replicating
Existing Objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-what-is-isnot-replicated.html#existing-object-replication)
in the Amazon S3 Developer Guide.
in the Amazon S3 User Guide.
properties:
status:
type: string
Expand All @@ -849,7 +857,7 @@ spec:
\n * If you specify both a Prefix and a Tag filter,
wrap these filters in an And tag. \n * If you
specify a filter based on multiple tags, wrap the
Tag elements in an And tag"
Tag elements in an And tag."
properties:
prefix:
type: string
Expand Down Expand Up @@ -888,8 +896,8 @@ spec:
You can choose to enable or disable the replication of
these objects. Currently, Amazon S3 supports only the
filter that you can specify for objects created with server-side
encryption using a customer master key (CMK) stored in
AWS Key Management Service (SSE-KMS).
encryption using a customer managed key stored in Amazon
Web Services Key Management Service (SSE-KMS).
properties:
replicaModifications:
description: "A filter that you can specify for selection
Expand All @@ -908,7 +916,8 @@ spec:
type: object
sseKMSEncryptedObjects:
description: A container for filter information for
the selection of S3 objects encrypted with AWS KMS.
the selection of S3 objects encrypted with Amazon
Web Services KMS.
properties:
status:
type: string
Expand Down Expand Up @@ -974,7 +983,7 @@ spec:
description: Specifies the redirect behavior and when a redirect
is applied. For more information about routing rules, see
Configuring advanced conditional redirects (https://docs.aws.amazon.com/AmazonS3/latest/dev/how-to-page-redirect.html#advanced-conditional-redirects)
in the Amazon Simple Storage Service Developer Guide.
in the Amazon S3 User Guide.
properties:
condition:
description: A container for describing a condition that
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/cluster-role-binding.yaml
View file
Expand Up @@ -8,5 +8,5 @@ roleRef:
name: ack-s3-controller
subjects:
- kind: ServiceAccount
name: default
name: ack-s3-controller
namespace: ack-system
2 changes: 2 additions & 0 deletions config/rbac/kustomization.yaml
View file
Expand Up @@ -3,3 +3,5 @@ resources:
- cluster-role-controller.yaml
- role-reader.yaml
- role-writer.yaml
- service-account.yaml

6 changes: 6 additions & 0 deletions config/rbac/service-account.yaml
View file
@@ -0,0 +1,6 @@
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: ack-s3-controller
namespace: ack-system
4 changes: 2 additions & 2 deletions go.mod
View file
Expand Up @@ -3,8 +3,8 @@ module github.com/aws-controllers-k8s/s3-controller
go 1.17

require (
github.com/aws-controllers-k8s/runtime v0.16.3
github.com/aws/aws-sdk-go v1.37.10
github.com/aws-controllers-k8s/runtime v0.16.5
github.com/aws/aws-sdk-go v1.42.0
github.com/go-logr/logr v1.2.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
Expand Down

0 comments on commit 2153e6d

Please sign in to comment.