Skip to content

Commit 2eff877

Browse files
feat(kmsMasterKeyRef): allow Bucket encryption with KMS key reference
1 parent 4576869 commit 2eff877

File tree

4 files changed

+59
-0
lines changed

4 files changed

+59
-0
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,21 @@ spec:
216216
properties:
217217
kmsMasterKeyID:
218218
type: string
219+
kmsMasterKeyRef:
220+
description: "AWSResourceReferenceWrapper provides a wrapper around
221+
*AWSResourceReference\ntype to provide more user friendly syntax
222+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
223+
\ name: my-api"
224+
properties:
225+
from:
226+
description: |-
227+
AWSResourceReference provides all the values necessary to reference another
228+
k8s resource for finding the identifier(Id/ARN/Name)
229+
properties:
230+
name: string
231+
namespace: string
232+
type: object
233+
type: object
219234
sseAlgorithm:
220235
type: string
221236
type: object

config/rbac/cluster-role-controller.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,20 @@ rules:
2222
- get
2323
- list
2424
- watch
25+
- apiGroups:
26+
- kms.services.k8s.aws
27+
resources:
28+
- keys
29+
verbs:
30+
- get
31+
- list
32+
- apiGroups:
33+
- kms.services.k8s.aws
34+
resources:
35+
- keys/status
36+
verbs:
37+
- get
38+
- list
2539
- apiGroups:
2640
- s3.services.k8s.aws
2741
resources:

helm/crds/s3.services.k8s.aws_buckets.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,22 @@ spec:
216216
properties:
217217
kmsMasterKeyID:
218218
type: string
219+
kmsMasterKeyRef:
220+
description: |-
221+
"AWSResourceReferenceWrapper provides a wrapper around
222+
*AWSResourceReference\ntype to provide more user friendly syntax
223+
for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t
224+
\ name: my-api"
225+
properties:
226+
from:
227+
description: |-
228+
AWSResourceReference provides all the values necessary to reference another
229+
k8s resource for finding the identifier(Id/ARN/Name)
230+
properties:
231+
name: string
232+
namespace: string
233+
type: object
234+
type: object
219235
sseAlgorithm:
220236
type: string
221237
type: object

helm/templates/_helpers.tpl

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,20 @@ rules:
6969
- get
7070
- list
7171
- watch
72+
- apiGroups:
73+
- kms.services.k8s.aws
74+
resources:
75+
- keys
76+
verbs:
77+
- get
78+
- list
79+
- apiGroups:
80+
- kms.services.k8s.aws
81+
resources:
82+
- keys/status
83+
verbs:
84+
- get
85+
- list
7286
- apiGroups:
7387
- s3.services.k8s.aws
7488
resources:

0 commit comments

Comments
 (0)