Skip to content

Commit 92739e6

Browse files
7navyasa7navyasa
authored
Gatekeeper S3 Example API Upgrade (#209)
* management policies addition * management policies removal from K8-provider * load balancer controller addition * updating policy to access global and local index * Update dynamodb-write.yaml license * upgrade deprecated api * PR review fix * gatekeeper example api upgrade * gatekeeper s3 exampleyaml update
1 parent eb47c4c commit 92739e6

File tree

6 files changed

+33
-57
lines changed

6 files changed

+33
-57
lines changed

‎examples/gatekeeper/duplicate-s3/samples/allowed-bucket.yaml

+8-16
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
1-
apiVersion: s3.aws.crossplane.io/v1beta1
1+
apiVersion: s3.aws.upbound.io/v1beta1
22
kind: Bucket
33
metadata:
44
annotations:
5-
crossplane.io/external-create-pending: "2023-06-15T21:17:04Z"
6-
crossplane.io/external-create-succeeded: "2023-06-15T21:17:05Z"
7-
crossplane.io/external-name: my-bucket-456-$ACCOUNT_ID
5+
upbound.io/external-create-pending: "2023-06-15T21:17:04Z"
6+
upbound.io/external-create-succeeded: "2023-06-15T21:17:05Z"
7+
upbound.io/external-name: my-bucket-456-$ACCOUNT_ID
88
labels:
9-
crossplane.io/claim-name: standard-object-storage
10-
crossplane.io/claim-namespace: default
11-
crossplane.io/composite: standard-object-storage-xwghv
9+
upbound.io/claim-name: standard-object-storage
10+
upbound.io/claim-namespace: default
11+
upbound.io/composite: standard-object-storage-xwghv
1212
name: standard-object-storage-new
1313
spec:
1414
deletionPolicy: Delete
1515
forProvider:
16-
locationConstraint: us-west-2
17-
objectOwnership: BucketOwnerEnforced
18-
paymentConfiguration:
19-
payer: BucketOwner
20-
publicAccessBlockConfiguration:
21-
blockPublicAcls: true
22-
blockPublicPolicy: true
23-
ignorePublicAcls: true
24-
restrictPublicBuckets: true
16+
region: us-west-2
2517
providerConfigRef:
2618
name: aws-provider-config

‎examples/gatekeeper/duplicate-s3/samples/constraint.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ spec:
77
kinds:
88
- apiGroups: ["awsblueprints.io"]
99
kinds: ["ObjectStorage"]
10-
- apiGroups: ["s3.aws.crossplane.io"]
10+
- apiGroups: ["s3.aws.upbound.io"]
1111
kinds: ["Bucket"]

‎examples/gatekeeper/duplicate-s3/samples/existing-buckets.yaml

+8-16
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
1-
apiVersion: s3.aws.crossplane.io/v1beta1
1+
apiVersion: s3.aws.upbound.io/v1beta1
22
kind: Bucket
33
metadata:
44
annotations:
5-
crossplane.io/external-create-pending: "2023-06-15T21:17:04Z"
6-
crossplane.io/external-create-succeeded: "2023-06-15T21:17:05Z"
7-
crossplane.io/external-name: my-bucket-123-$ACCOUNT_ID
5+
upbound.io/external-create-pending: "2023-06-15T21:17:04Z"
6+
upbound.io/external-create-succeeded: "2023-06-15T21:17:05Z"
7+
upbound.io/external-name: my-bucket-123-$ACCOUNT_ID
88
labels:
9-
crossplane.io/claim-name: standard-object-storage
10-
crossplane.io/claim-namespace: default
11-
crossplane.io/composite: standard-object-storage-xwghv
9+
upbound.io/claim-name: standard-object-storage
10+
upbound.io/claim-namespace: default
11+
upbound.io/composite: standard-object-storage-xwghv
1212
name: standard-object-storage-exist
1313
spec:
1414
deletionPolicy: Delete
1515
forProvider:
16-
locationConstraint: us-west-2
17-
objectOwnership: BucketOwnerEnforced
18-
paymentConfiguration:
19-
payer: BucketOwner
20-
publicAccessBlockConfiguration:
21-
blockPublicAcls: true
22-
blockPublicPolicy: true
23-
ignorePublicAcls: true
24-
restrictPublicBuckets: true
16+
region: us-west-2
2517
providerConfigRef:
2618
name: aws-provider-config

‎examples/gatekeeper/duplicate-s3/samples/not-allowed-bucket.yaml

+8-16
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
1-
apiVersion: s3.aws.crossplane.io/v1beta1
1+
apiVersion: s3.aws.upbound.io/v1beta1
22
kind: Bucket
33
metadata:
44
annotations:
5-
crossplane.io/external-create-pending: "2023-06-15T21:17:04Z"
6-
crossplane.io/external-create-succeeded: "2023-06-15T21:17:05Z"
7-
crossplane.io/external-name: my-bucket-123-$ACCOUNT_ID
5+
upbound.io/external-create-pending: "2023-06-15T21:17:04Z"
6+
upbound.io/external-create-succeeded: "2023-06-15T21:17:05Z"
7+
upbound.io/external-name: my-bucket-123-$ACCOUNT_ID
88
labels:
9-
crossplane.io/claim-name: standard-object-storage
10-
crossplane.io/claim-namespace: default
11-
crossplane.io/composite: standard-object-storage-xwghv
9+
upbound.io/claim-name: standard-object-storage
10+
upbound.io/claim-namespace: default
11+
upbound.io/composite: standard-object-storage-xwghv
1212
name: standard-object-storage-new
1313
spec:
1414
deletionPolicy: Delete
1515
forProvider:
16-
locationConstraint: us-west-2
17-
objectOwnership: BucketOwnerEnforced
18-
paymentConfiguration:
19-
payer: BucketOwner
20-
publicAccessBlockConfiguration:
21-
blockPublicAcls: true
22-
blockPublicPolicy: true
23-
ignorePublicAcls: true
24-
restrictPublicBuckets: true
16+
region: us-west-2
2517
providerConfigRef:
2618
name: aws-provider-config

‎examples/gatekeeper/duplicate-s3/syncset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ metadata:
44
name: s3-syncset
55
spec:
66
gvks:
7-
- group: "s3.aws.crossplane.io"
7+
- group: "s3.aws.upbound.io"
88
version: "v1beta1"
99
kind: "Bucket"

‎examples/gatekeeper/duplicate-s3/template.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ spec:
2020
#}
2121
2222
sameClaim(obj, review) {
23-
obj.metadata.labels["crossplane.io/claim-namespace"] == review.object.metadata.namespace
24-
obj.metadata.labels["crossplane.io/claim-name"] == review.object.metadata.name
23+
obj.metadata.labels["upbound.io/claim-namespace"] == review.object.metadata.namespace
24+
obj.metadata.labels["upbound.io/claim-name"] == review.object.metadata.name
2525
}
2626
2727
sameBucketMR(obj, review) {
@@ -32,12 +32,12 @@ spec:
3232
violation[{"msg": msg}] {
3333
review := input.review
3434
review.object.kind == "ObjectStorage"
35-
obj := data.inventory.cluster["s3.aws.crossplane.io/v1beta1"].Bucket[_]
35+
obj := data.inventory.cluster["s3.aws.upbound.io/v1beta1"].Bucket[_]
3636
not sameClaim(obj, review)
3737
claimName := review.object.metadata.name
3838
claimNameSpace := review.object.metadata.namespace
3939
bucket := review.object.spec.resourceConfig.name
40-
bucket == obj.metadata.annotations["crossplane.io/external-name"]
40+
bucket == obj.metadata.annotations["upbound.io/external-name"]
4141
4242
msg := sprintf(
4343
"Claim %v in namespace %v requesting Bucket %v is already managed by Bucket MR %v",
@@ -48,10 +48,10 @@ spec:
4848
violation[{"msg": msg}] {
4949
review := input.review
5050
review.object.kind == "Bucket"
51-
obj := data.inventory.cluster["s3.aws.crossplane.io/v1beta1"].Bucket[_]
51+
obj := data.inventory.cluster["s3.aws.upbound.io/v1beta1"].Bucket[_]
5252
not sameBucketMR(obj, review)
53-
newBucket := review.object.metadata.annotations["crossplane.io/external-name"]
54-
existingBucket := obj.metadata.annotations["crossplane.io/external-name"]
53+
newBucket := review.object.metadata.annotations["upbound.io/external-name"]
54+
existingBucket := obj.metadata.annotations["upbound.io/external-name"]
5555
newBucket == existingBucket
5656
5757
msg := sprintf(

0 commit comments

Comments
 (0)