Skip to content

Commit b23f978

Browse files
Update runtime to v0.7.1 (#24)
Updates the controller to ACK runtime `v.0.7.1`
1 parent cd3ff2c commit b23f978

File tree

14 files changed

+171
-44
lines changed

14 files changed

+171
-44
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
ack_generate_info:
2+
build_date: "2021-07-27T22:56:45Z"
3+
build_hash: 5a40e37032506f12a07b7de12a6005b525d13ad9
4+
go_version: go1.15.6 linux/amd64
5+
version: v0.7.0
6+
api_directory_checksum: 73b58f20311ba8bf905c26dc7cbefd66624eb2ee
7+
api_version: v1alpha1
8+
aws_sdk_go_version: v1.37.4
9+
generator_config_info:
10+
file_checksum: 12ca89a38944275f5d381defdb3bc9c71e9f4fae
11+
original_file_name: generator.yaml
12+
last_modification:
13+
reason: API generation
14+
timestamp: 2021-07-27 22:56:51.179426188 +0000 UTC

apis/v1alpha1/bucket.go

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/generator.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
ignore:
2+
resource_names:
3+
- Object
4+
- MultipartUpload
5+
shape_names:
6+
# These shapes are structs with no members...
7+
- SSES3
8+
operations:
9+
ListBuckets:
10+
primary_identifier_field_name: Name
11+
resources:
12+
Bucket:
13+
renames:
14+
operations:
15+
CreateBucket:
16+
input_fields:
17+
Bucket: Name
18+
DeleteBucket:
19+
input_fields:
20+
Bucket: Name
21+
list_operation:
22+
match_fields:
23+
- Name

cmd/controller/main.go

Lines changed: 29 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/controller/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ spec:
3636
- "$(ACK_LOG_LEVEL)"
3737
- --resource-tags
3838
- "$(ACK_RESOURCE_TAGS)"
39+
- --watch-namespace
40+
- "$(ACK_WATCH_NAMESPACE)"
3941
image: controller:latest
4042
name: controller
4143
ports:

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.0
7+
controller-gen.kubebuilder.io/version: v0.6.1
88
creationTimestamp: null
99
name: buckets.s3.services.k8s.aws
1010
spec:
@@ -34,7 +34,9 @@ spec:
3434
metadata:
3535
type: object
3636
spec:
37-
description: BucketSpec defines the desired state of Bucket
37+
description: "BucketSpec defines the desired state of Bucket. \n In terms
38+
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."
3840
properties:
3941
acl:
4042
description: The canned ACL to apply to the bucket.
@@ -136,9 +138,6 @@ spec:
136138
If you are creating a bucket on the US East (N. Virginia) Region
137139
(us-east-1), you do not need to specify the location.
138140
type: string
139-
required:
140-
- ackResourceMetadata
141-
- conditions
142141
type: object
143142
type: object
144143
served: true

config/crd/common/bases/services.k8s.aws_adoptedresources.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ spec:
4040
description: AWSIdentifiers provide all unique ways to reference an
4141
AWS resource.
4242
properties:
43+
additionalKeys:
44+
additionalProperties:
45+
type: string
46+
description: AdditionalKeys represents any additional arbitrary
47+
identifiers used when describing the target resource.
48+
type: object
4349
arn:
4450
description: ARN is the AWS Resource Name for the resource. It
4551
is a globally unique identifier.

generator.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ ignore:
55
shape_names:
66
# These shapes are structs with no members...
77
- SSES3
8+
operations:
9+
ListBuckets:
10+
primary_identifier_field_name: Name
811
resources:
912
Bucket:
1013
renames:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/s3-controller
33
go 1.14
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.1.2
6+
github.com/aws-controllers-k8s/runtime v0.7.1
77
github.com/aws/aws-sdk-go v1.37.4
88
github.com/go-logr/logr v0.1.0
99
github.com/spf13/pflag v1.0.5

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:l
2525
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
2626
github.com/aws-controllers-k8s/runtime v0.1.2 h1:prqFY6tlmgsGMZizHvHqDqT1zECRqllepqplOHet4D4=
2727
github.com/aws-controllers-k8s/runtime v0.1.2/go.mod h1:xA2F18PJerBHaqrS4de1lpP7skeSMeStkmh+3x5sWvw=
28+
github.com/aws-controllers-k8s/runtime v0.7.1 h1:iA7x1EBVRffg9aI7vhshWXLYkrd0ySw0qDmGG/10FFg=
29+
github.com/aws-controllers-k8s/runtime v0.7.1/go.mod h1:xA2F18PJerBHaqrS4de1lpP7skeSMeStkmh+3x5sWvw=
2830
github.com/aws/aws-sdk-go v1.37.4 h1:tWxrpMK/oRSXVnjUzhGeCWLR00fW0WF4V4sycYPPrJ8=
2931
github.com/aws/aws-sdk-go v1.37.4/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
3032
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

0 commit comments

Comments
 (0)