Skip to content

Commit b6f81ac

Browse files
authored
Merge pull request #295 from ricardo-larosa/update-types
Update crd, types and auto-generated code for S3
2 parents 68cf1dc + fca149d commit b6f81ac

File tree

6 files changed

+134
-114
lines changed

6 files changed

+134
-114
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ require (
2121
k8s.io/apimachinery v0.18.6
2222
k8s.io/client-go v0.18.2
2323
sigs.k8s.io/controller-runtime v0.6.0
24-
sigs.k8s.io/controller-tools v0.3.1-0.20200716001835-4a903ddb7005 // indirect
24+
sigs.k8s.io/controller-tools v0.4.0 // indirect
2525
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,8 @@ sigs.k8s.io/controller-tools v0.3.0 h1:y3YD99XOyWaXkiF1kd41uRvfp/64teWcrEZFuHxPh
515515
sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI=
516516
sigs.k8s.io/controller-tools v0.3.1-0.20200716001835-4a903ddb7005 h1:AJmBTL2CXoOuQxdyfV/I3z52CE8TKPGmqLGn7eEIOr8=
517517
sigs.k8s.io/controller-tools v0.3.1-0.20200716001835-4a903ddb7005/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU=
518+
sigs.k8s.io/controller-tools v0.4.0 h1:9zIdrc6q9RKke8+DnVPVBVZ+cfF9L0TwM01cxNnklYo=
519+
sigs.k8s.io/controller-tools v0.4.0/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU=
518520
sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
519521
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E=
520522
sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=

services/s3/apis/v1alpha1/types.go

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

services/s3/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.
Lines changed: 109 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

22
---
3-
apiVersion: apiextensions.k8s.io/v1beta1
3+
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.3.1-0.20200716001835-4a903ddb7005
7+
controller-gen.kubebuilder.io/version: v0.4.0
88
creationTimestamp: null
99
name: buckets.s3.services.k8s.aws
1010
spec:
@@ -15,122 +15,122 @@ spec:
1515
plural: buckets
1616
singular: bucket
1717
scope: Namespaced
18-
subresources:
19-
status: {}
20-
validation:
21-
openAPIV3Schema:
22-
description: Bucket is the Schema for the Buckets API
23-
properties:
24-
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
28-
type: string
29-
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
33-
type: string
34-
metadata:
35-
type: object
36-
spec:
37-
description: BucketSpec defines the desired state of Bucket
38-
properties:
39-
acl:
40-
type: string
41-
createBucketConfiguration:
42-
properties:
43-
locationConstraint:
44-
type: string
45-
type: object
46-
grantFullControl:
47-
type: string
48-
grantRead:
49-
type: string
50-
grantReadACP:
51-
type: string
52-
grantWrite:
53-
type: string
54-
grantWriteACP:
55-
type: string
56-
name:
57-
type: string
58-
objectLockEnabledForBucket:
59-
type: boolean
60-
type: object
61-
status:
62-
description: BucketStatus defines the observed state of Bucket
63-
properties:
64-
ackResourceMetadata:
65-
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
66-
member that is used to contain resource sync state, account ownership,
67-
constructed ARN for the resource
68-
properties:
69-
arn:
70-
description: 'ARN is the Amazon Resource Name for the resource.
71-
This is a globally-unique identifier and is set only by the ACK
72-
service controller once the controller has orchestrated the creation
73-
of the resource OR when it has verified that an "adopted" resource
74-
(a resource where the ARN annotation was set by the Kubernetes
75-
user on the CR) exists and matches the supplied CR''s Spec field
76-
values. TODO(vijat@): Find a better strategy for resources that
77-
do not have ARN in CreateOutputResponse https://github.com/aws/aws-controllers-k8s/issues/270'
78-
type: string
79-
ownerAccountID:
80-
description: OwnerAccountID is the AWS Account ID of the account
81-
that owns the backend AWS service API resource.
82-
type: string
83-
required:
84-
- ownerAccountID
85-
type: object
86-
conditions:
87-
description: All CRS managed by ACK have a common `Status.Conditions`
88-
member that contains a collection of `ackv1alpha1.Condition` objects
89-
that describe the various terminal states of the CR and its backend
90-
AWS service API resource
91-
items:
92-
description: Condition is the common struct used by all CRDs managed
93-
by ACK service controllers to indicate terminal states of the CR
94-
and its backend AWS service API resource
18+
versions:
19+
- name: v1alpha1
20+
schema:
21+
openAPIV3Schema:
22+
description: Bucket is the Schema for the Buckets API
23+
properties:
24+
apiVersion:
25+
description: 'APIVersion defines the versioned schema of this representation
26+
of an object. Servers should convert recognized schemas to the latest
27+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
28+
type: string
29+
kind:
30+
description: 'Kind is a string value representing the REST resource this
31+
object represents. Servers may infer this from the endpoint the client
32+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
33+
type: string
34+
metadata:
35+
type: object
36+
spec:
37+
description: BucketSpec defines the desired state of Bucket
38+
properties:
39+
acl:
40+
type: string
41+
createBucketConfiguration:
9542
properties:
96-
lastTransitionTime:
97-
description: Last time the condition transitioned from one status
98-
to another.
99-
format: date-time
100-
type: string
101-
message:
102-
description: A human readable message indicating details about
103-
the transition.
104-
type: string
105-
reason:
106-
description: The reason for the condition's last transition.
43+
locationConstraint:
10744
type: string
108-
status:
109-
description: Status of the condition, one of True, False, Unknown.
45+
type: object
46+
grantFullControl:
47+
type: string
48+
grantRead:
49+
type: string
50+
grantReadACP:
51+
type: string
52+
grantWrite:
53+
type: string
54+
grantWriteACP:
55+
type: string
56+
name:
57+
type: string
58+
objectLockEnabledForBucket:
59+
type: boolean
60+
type: object
61+
status:
62+
description: BucketStatus defines the observed state of Bucket
63+
properties:
64+
ackResourceMetadata:
65+
description: All CRs managed by ACK have a common `Status.ACKResourceMetadata`
66+
member that is used to contain resource sync state, account ownership,
67+
constructed ARN for the resource
68+
properties:
69+
arn:
70+
description: 'ARN is the Amazon Resource Name for the resource.
71+
This is a globally-unique identifier and is set only by the
72+
ACK service controller once the controller has orchestrated
73+
the creation of the resource OR when it has verified that an
74+
"adopted" resource (a resource where the ARN annotation was
75+
set by the Kubernetes user on the CR) exists and matches the
76+
supplied CR''s Spec field values. TODO(vijat@): Find a better
77+
strategy for resources that do not have ARN in CreateOutputResponse
78+
https://github.com/aws/aws-controllers-k8s/issues/270'
11079
type: string
111-
type:
112-
description: Type is the type of the Condition
80+
ownerAccountID:
81+
description: OwnerAccountID is the AWS Account ID of the account
82+
that owns the backend AWS service API resource.
11383
type: string
11484
required:
115-
- status
116-
- type
85+
- ownerAccountID
11786
type: object
118-
type: array
119-
location:
120-
type: string
121-
required:
122-
- ackResourceMetadata
123-
- conditions
124-
type: object
125-
type: object
126-
version: v1alpha1
127-
versions:
128-
- name: v1alpha1
87+
conditions:
88+
description: All CRS managed by ACK have a common `Status.Conditions`
89+
member that contains a collection of `ackv1alpha1.Condition` objects
90+
that describe the various terminal states of the CR and its backend
91+
AWS service API resource
92+
items:
93+
description: Condition is the common struct used by all CRDs managed
94+
by ACK service controllers to indicate terminal states of the
95+
CR and its backend AWS service API resource
96+
properties:
97+
lastTransitionTime:
98+
description: Last time the condition transitioned from one status
99+
to another.
100+
format: date-time
101+
type: string
102+
message:
103+
description: A human readable message indicating details about
104+
the transition.
105+
type: string
106+
reason:
107+
description: The reason for the condition's last transition.
108+
type: string
109+
status:
110+
description: Status of the condition, one of True, False, Unknown.
111+
type: string
112+
type:
113+
description: Type is the type of the Condition
114+
type: string
115+
required:
116+
- status
117+
- type
118+
type: object
119+
type: array
120+
location:
121+
type: string
122+
required:
123+
- ackResourceMetadata
124+
- conditions
125+
type: object
126+
type: object
129127
served: true
130128
storage: true
129+
subresources:
130+
status: {}
131131
status:
132132
acceptedNames:
133133
kind: ""
134134
plural: ""
135-
conditions: null
136-
storedVersions: null
135+
conditions: []
136+
storedVersions: []

services/s3/config/rbac/cluster-role-binding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
roleRef:
66
apiGroup: rbac.authorization.k8s.io
77
kind: ClusterRole
8-
name: ack-controller-role
8+
name: ack-controller
99
subjects:
1010
- kind: ServiceAccount
1111
name: default

0 commit comments

Comments
 (0)