From 1f97a70936f996e6beb8d628856150117bceaca7 Mon Sep 17 00:00:00 2001 From: 7navyasa Date: Fri, 12 Jul 2024 17:13:32 +1000 Subject: [PATCH] gatekeeper example api upgrade --- .../duplicate-s3/samples/allowed-bucket.yaml | 2 +- .../duplicate-s3/samples/constraint.yaml | 2 +- .../duplicate-s3/samples/existing-buckets.yaml | 2 +- .../duplicate-s3/samples/not-allowed-bucket.yaml | 2 +- examples/gatekeeper/duplicate-s3/syncset.yaml | 2 +- examples/gatekeeper/duplicate-s3/template.yaml | 14 +++++++------- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/gatekeeper/duplicate-s3/samples/allowed-bucket.yaml b/examples/gatekeeper/duplicate-s3/samples/allowed-bucket.yaml index e2531e19..44aaa628 100644 --- a/examples/gatekeeper/duplicate-s3/samples/allowed-bucket.yaml +++ b/examples/gatekeeper/duplicate-s3/samples/allowed-bucket.yaml @@ -1,4 +1,4 @@ -apiVersion: s3.aws.crossplane.io/v1beta1 +apiVersion: s3.aws.upbound.io/v1beta1 kind: Bucket metadata: annotations: diff --git a/examples/gatekeeper/duplicate-s3/samples/constraint.yaml b/examples/gatekeeper/duplicate-s3/samples/constraint.yaml index b2575698..06f5b38d 100644 --- a/examples/gatekeeper/duplicate-s3/samples/constraint.yaml +++ b/examples/gatekeeper/duplicate-s3/samples/constraint.yaml @@ -7,5 +7,5 @@ spec: kinds: - apiGroups: ["awsblueprints.io"] kinds: ["ObjectStorage"] - - apiGroups: ["s3.aws.crossplane.io"] + - apiGroups: ["s3.aws.upbound.io"] kinds: ["Bucket"] diff --git a/examples/gatekeeper/duplicate-s3/samples/existing-buckets.yaml b/examples/gatekeeper/duplicate-s3/samples/existing-buckets.yaml index 18ede933..8d4ea5be 100644 --- a/examples/gatekeeper/duplicate-s3/samples/existing-buckets.yaml +++ b/examples/gatekeeper/duplicate-s3/samples/existing-buckets.yaml @@ -1,4 +1,4 @@ -apiVersion: s3.aws.crossplane.io/v1beta1 +apiVersion: s3.aws.upbound.io/v1beta1 kind: Bucket metadata: annotations: diff --git a/examples/gatekeeper/duplicate-s3/samples/not-allowed-bucket.yaml b/examples/gatekeeper/duplicate-s3/samples/not-allowed-bucket.yaml index 2d79f53a..546cafac 100644 --- a/examples/gatekeeper/duplicate-s3/samples/not-allowed-bucket.yaml +++ b/examples/gatekeeper/duplicate-s3/samples/not-allowed-bucket.yaml @@ -1,4 +1,4 @@ -apiVersion: s3.aws.crossplane.io/v1beta1 +apiVersion: s3.aws.upbound.io/v1beta1 kind: Bucket metadata: annotations: diff --git a/examples/gatekeeper/duplicate-s3/syncset.yaml b/examples/gatekeeper/duplicate-s3/syncset.yaml index 08a0bf2d..f39d35ab 100644 --- a/examples/gatekeeper/duplicate-s3/syncset.yaml +++ b/examples/gatekeeper/duplicate-s3/syncset.yaml @@ -4,6 +4,6 @@ metadata: name: s3-syncset spec: gvks: - - group: "s3.aws.crossplane.io" + - group: "s3.aws.upbound.io" version: "v1beta1" kind: "Bucket" diff --git a/examples/gatekeeper/duplicate-s3/template.yaml b/examples/gatekeeper/duplicate-s3/template.yaml index 2b01e736..014437f8 100644 --- a/examples/gatekeeper/duplicate-s3/template.yaml +++ b/examples/gatekeeper/duplicate-s3/template.yaml @@ -20,8 +20,8 @@ spec: #} sameClaim(obj, review) { - obj.metadata.labels["crossplane.io/claim-namespace"] == review.object.metadata.namespace - obj.metadata.labels["crossplane.io/claim-name"] == review.object.metadata.name + obj.metadata.labels["upbound.io/claim-namespace"] == review.object.metadata.namespace + obj.metadata.labels["upbound.io/claim-name"] == review.object.metadata.name } sameBucketMR(obj, review) { @@ -32,12 +32,12 @@ spec: violation[{"msg": msg}] { review := input.review review.object.kind == "ObjectStorage" - obj := data.inventory.cluster["s3.aws.crossplane.io/v1beta1"].Bucket[_] + obj := data.inventory.cluster["s3.aws.upbound.io/v1beta1"].Bucket[_] not sameClaim(obj, review) claimName := review.object.metadata.name claimNameSpace := review.object.metadata.namespace bucket := review.object.spec.resourceConfig.name - bucket == obj.metadata.annotations["crossplane.io/external-name"] + bucket == obj.metadata.annotations["upbound.io/external-name"] msg := sprintf( "Claim %v in namespace %v requesting Bucket %v is already managed by Bucket MR %v", @@ -48,10 +48,10 @@ spec: violation[{"msg": msg}] { review := input.review review.object.kind == "Bucket" - obj := data.inventory.cluster["s3.aws.crossplane.io/v1beta1"].Bucket[_] + obj := data.inventory.cluster["s3.aws.upbound.io/v1beta1"].Bucket[_] not sameBucketMR(obj, review) - newBucket := review.object.metadata.annotations["crossplane.io/external-name"] - existingBucket := obj.metadata.annotations["crossplane.io/external-name"] + newBucket := review.object.metadata.annotations["upbound.io/external-name"] + existingBucket := obj.metadata.annotations["upbound.io/external-name"] newBucket == existingBucket msg := sprintf(