Skip to content

Commit 3fd5237

Browse files
committed
fix: v2 cleanup
1 parent 01e502b commit 3fd5237

File tree

4 files changed

+5
-20
lines changed

4 files changed

+5
-20
lines changed

packages/sdk/src/Model/index.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,22 +96,6 @@ export class Model<T> extends BaseModel<T> {
9696
return self.status || {}
9797
}
9898

99-
/**
100-
* Get the claim namespace from annotations (legacy method)
101-
* @returns The claim namespace
102-
* @throws Error if the resource wasn't created via a claim
103-
*/
104-
getClaimNamespace(): string {
105-
const { name } = this.getMetadata()
106-
const claimNamespace = this.getMetadata().labels?.["crossplane.io/claim-namespace"]
107-
108-
if (!claimNamespace) {
109-
throw new Error(`Resource ${name} wasn't created via a claim`)
110-
}
111-
112-
return claimNamespace
113-
}
114-
11599
/**
116100
* Check if this resource is ready based on its status conditions
117101
* @returns true if the resource is ready, false otherwise

tests/fixtures/domain-sdk/functions/xsimpleconfigmaps/composition.fn.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type { XSimpleConfigMap } from "@/models/test.crossplane.io/v1beta1"
66
export default function(composite: XSimpleConfigMap, _resources: CrossplaneObservedResources): CrossplaneDesiredResources {
77
logger.info("Composition function started")
88

9-
// const namespace = composite.getClaimNamespace()
9+
const namespace = composite.getNamespace()
1010
const isReady = composite.isReady()
1111

1212
logger.info(`Ready: ${isReady}`)
@@ -23,8 +23,7 @@ export default function(composite: XSimpleConfigMap, _resources: CrossplaneObser
2323
const testConfigMap = new v1.ConfigMap({
2424
metadata: {
2525
name: "generated-configmap",
26-
namespace: "test-xfuncjs",
27-
// namespace: namespace,
26+
namespace: namespace,
2827
labels: {
2928
example: "true"
3029
},

tests/fixtures/domain-sdk/functions/xsimpleconfigmaps/xrd.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
apiVersion: apiextensions.crossplane.io/v1
1+
apiVersion: apiextensions.crossplane.io/v2
22
kind: CompositeResourceDefinition
33
metadata:
44
name: xsimpleconfigmaps.test.crossplane.io
55
spec:
6+
scope: Namespaced
67
group: test.crossplane.io
78
names:
89
kind: XSimpleConfigMap

tests/fixtures/domain-sdk/sample.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: test.crossplane.io/v1beta1
22
kind: XSimpleConfigMap
33
metadata:
44
name: sample-configmap
5+
namespace: test-xfuncjs
56
spec:
67
data:
78
name: "John Doe"

0 commit comments

Comments
 (0)