typekro 0.33.5 → 0.33.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/alchemy/deployers.d.ts +5 -2
- package/dist/alchemy/deployers.d.ts.map +1 -1
- package/dist/alchemy/deployers.js +13 -4
- package/dist/alchemy/deployers.js.map +1 -1
- package/dist/alchemy/kro-delete.d.ts +22 -0
- package/dist/alchemy/kro-delete.d.ts.map +1 -1
- package/dist/alchemy/kro-delete.js +17 -0
- package/dist/alchemy/kro-delete.js.map +1 -1
- package/dist/alchemy/resource-registration.d.ts +4 -1
- package/dist/alchemy/resource-registration.d.ts.map +1 -1
- package/dist/alchemy/resource-registration.js +38 -4
- package/dist/alchemy/resource-registration.js.map +1 -1
- package/dist/core/aspects/apply.d.ts.map +1 -1
- package/dist/core/aspects/apply.js +3 -0
- package/dist/core/aspects/apply.js.map +1 -1
- package/dist/core/composition/imperative.d.ts.map +1 -1
- package/dist/core/composition/imperative.js +34 -1
- package/dist/core/composition/imperative.js.map +1 -1
- package/dist/core/dependencies/resolver.d.ts +1 -0
- package/dist/core/dependencies/resolver.d.ts.map +1 -1
- package/dist/core/dependencies/resolver.js +51 -18
- package/dist/core/dependencies/resolver.js.map +1 -1
- package/dist/core/deployment/kro-artifact-binding-migration.d.ts +13 -0
- package/dist/core/deployment/kro-artifact-binding-migration.d.ts.map +1 -1
- package/dist/core/deployment/kro-artifact-binding-migration.js +73 -2
- package/dist/core/deployment/kro-artifact-binding-migration.js.map +1 -1
- package/dist/core/deployment/kro-factory.d.ts +1 -0
- package/dist/core/deployment/kro-factory.d.ts.map +1 -1
- package/dist/core/deployment/kro-factory.js +11 -4
- package/dist/core/deployment/kro-factory.js.map +1 -1
- package/dist/core/metadata/resource-metadata.d.ts +9 -0
- package/dist/core/metadata/resource-metadata.d.ts.map +1 -1
- package/dist/core/metadata/resource-metadata.js.map +1 -1
- package/dist/factories/nats/compositions/index.d.ts +1 -0
- package/dist/factories/nats/compositions/index.d.ts.map +1 -1
- package/dist/factories/nats/compositions/index.js +1 -0
- package/dist/factories/nats/compositions/index.js.map +1 -1
- package/dist/factories/nats/compositions/nack-controller-bootstrap.d.ts +44 -0
- package/dist/factories/nats/compositions/nack-controller-bootstrap.d.ts.map +1 -0
- package/dist/factories/nats/compositions/nack-controller-bootstrap.js +157 -0
- package/dist/factories/nats/compositions/nack-controller-bootstrap.js.map +1 -0
- package/dist/factories/nats/compositions/nack-controller-migration.d.ts +18 -0
- package/dist/factories/nats/compositions/nack-controller-migration.d.ts.map +1 -0
- package/dist/factories/nats/compositions/nack-controller-migration.js +126 -0
- package/dist/factories/nats/compositions/nack-controller-migration.js.map +1 -0
- package/dist/factories/nats/compositions/nats-bootstrap.d.ts +31 -1
- package/dist/factories/nats/compositions/nats-bootstrap.d.ts.map +1 -1
- package/dist/factories/nats/compositions/nats-bootstrap.js +186 -119
- package/dist/factories/nats/compositions/nats-bootstrap.js.map +1 -1
- package/dist/factories/nats/resources/helm.d.ts +1 -0
- package/dist/factories/nats/resources/helm.d.ts.map +1 -1
- package/dist/factories/nats/resources/helm.js +1 -0
- package/dist/factories/nats/resources/helm.js.map +1 -1
- package/dist/factories/nats/types.d.ts +46 -0
- package/dist/factories/nats/types.d.ts.map +1 -1
- package/dist/factories/nats/types.js +30 -0
- package/dist/factories/nats/types.js.map +1 -1
- package/package.json +3 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../src/core/dependencies/resolver.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAaH,OAAO,KAAK,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAA6C;IAE3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,8BAA8B,CACgC;IACtF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CACgD;IAE7F;;OAEG;IACH,oBAAoB,CAClB,SAAS,EAAE,qBAAqB,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,EAC9D,OAAO,GAAE;QAAE,QAAQ,CAAC,wBAAwB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;KAAO,GACxE,eAAe;
|
|
1
|
+
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../src/core/dependencies/resolver.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAaH,OAAO,KAAK,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAA6C;IAE3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,8BAA8B,CACgC;IACtF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CACgD;IAE7F;;OAEG;IACH,oBAAoB,CAClB,SAAS,EAAE,qBAAqB,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,EAC9D,OAAO,GAAE;QAAE,QAAQ,CAAC,wBAAwB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;KAAO,GACxE,eAAe;IAyNlB,OAAO,CAAC,uBAAuB;IAgC/B;;;;;;OAMG;IACH;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAyC;IAE9E,OAAO,CAAC,+BAA+B;IAiEvC,OAAO,CAAC,qBAAqB;IAkD7B,OAAO,CAAC,mBAAmB;IAiE3B;;OAEG;IACH,mBAAmB,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,EAAE;IAIrD;;OAEG;IACH,gBAAgB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAS9C;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAoCzB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,qBAAqB;IAsB7B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAiC1B;;OAEG;IACH,sBAAsB,CAAC,KAAK,EAAE,eAAe,GAAG,cAAc;IA0C9D;;;;;;;;;OASG;IACH,oBAAoB,CAAC,KAAK,EAAE,eAAe,EAAE,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,cAAc;IAe7F;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAyB7B;;OAEG;IACH,gBAAgB,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,EAAE;IAKlD;;OAEG;IACH,wBAAwB,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,EAAE;IAI1D;;OAEG;IACH,qBAAqB,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,EAAE;CAGxD;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB"}
|
|
@@ -20,28 +20,36 @@ export class DependencyResolver {
|
|
|
20
20
|
*/
|
|
21
21
|
buildDependencyGraph(resources, options = {}) {
|
|
22
22
|
const graph = new DependencyGraph();
|
|
23
|
-
// Add all resources as nodes and build a reverse map from
|
|
24
|
-
//
|
|
25
|
-
//
|
|
26
|
-
//
|
|
27
|
-
|
|
23
|
+
// Add all resources as nodes and build a reverse map from every authored
|
|
24
|
+
// identity to graph IDs. References may use the graph ID, the resource's
|
|
25
|
+
// original composition ID, or a local-variable/callback alias preserved in
|
|
26
|
+
// resource metadata. Nested compositions prefix graph IDs, so resolving only
|
|
27
|
+
// the original resource ID loses otherwise valid dependencies.
|
|
28
|
+
const identityToGraphIds = new Map();
|
|
29
|
+
const registerIdentity = (identity, graphId) => {
|
|
30
|
+
if (!identity)
|
|
31
|
+
return;
|
|
32
|
+
const owners = identityToGraphIds.get(identity) ?? new Set();
|
|
33
|
+
owners.add(graphId);
|
|
34
|
+
identityToGraphIds.set(identity, owners);
|
|
35
|
+
};
|
|
28
36
|
for (const resource of resources) {
|
|
29
37
|
graph.addNode(resource.id, resource);
|
|
30
38
|
const originalId = getResourceId(resource);
|
|
31
|
-
|
|
32
|
-
|
|
39
|
+
registerIdentity(resource.id, resource.id);
|
|
40
|
+
registerIdentity(originalId, resource.id);
|
|
41
|
+
for (const alias of getMetadataField(resource, 'resourceAliases') ?? []) {
|
|
42
|
+
registerIdentity(alias, resource.id);
|
|
33
43
|
}
|
|
34
44
|
}
|
|
35
45
|
// Analyze each resource for references and add edges
|
|
36
46
|
for (const resource of resources) {
|
|
37
47
|
const references = this.extractReferences(resource);
|
|
48
|
+
const warnedUnknownReferences = new Set();
|
|
38
49
|
for (const ref of references) {
|
|
39
50
|
// Skip schema references (these are internal TypeKro references)
|
|
40
51
|
if (ref.resourceId !== '__schema__' && ref.resourceId !== 'schema') {
|
|
41
|
-
|
|
42
|
-
const targetId = graph.hasNode(ref.resourceId)
|
|
43
|
-
? ref.resourceId
|
|
44
|
-
: originalIdToGraphId.get(ref.resourceId);
|
|
52
|
+
const targetId = this.resolveResourceIdentity(ref.resourceId, identityToGraphIds, resource);
|
|
45
53
|
if (targetId) {
|
|
46
54
|
try {
|
|
47
55
|
graph.addEdge(resource.id, targetId);
|
|
@@ -53,18 +61,19 @@ export class DependencyResolver {
|
|
|
53
61
|
else {
|
|
54
62
|
// Log warning if referenced resource doesn't exist in the graph
|
|
55
63
|
// This might be an external reference that will be resolved at runtime
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
64
|
+
if (!warnedUnknownReferences.has(ref.resourceId)) {
|
|
65
|
+
warnedUnknownReferences.add(ref.resourceId);
|
|
66
|
+
this.logger.warn('Reference to unknown resource', {
|
|
67
|
+
referencedResourceId: ref.resourceId,
|
|
68
|
+
sourceResourceId: resource.id,
|
|
69
|
+
});
|
|
70
|
+
}
|
|
60
71
|
}
|
|
61
72
|
}
|
|
62
73
|
}
|
|
63
74
|
const explicitDependencies = getMetadataField(resource, 'dependsOn');
|
|
64
75
|
for (const dep of explicitDependencies ?? []) {
|
|
65
|
-
const targetId =
|
|
66
|
-
? dep.resourceId
|
|
67
|
-
: originalIdToGraphId.get(dep.resourceId);
|
|
76
|
+
const targetId = this.resolveResourceIdentity(dep.resourceId, identityToGraphIds, resource);
|
|
68
77
|
if (!targetId) {
|
|
69
78
|
if (options.knownExternalResourceIds?.has(dep.resourceId)) {
|
|
70
79
|
this.logger.debug('Skipping apply-order edge to known external resource', {
|
|
@@ -195,6 +204,30 @@ export class DependencyResolver {
|
|
|
195
204
|
}
|
|
196
205
|
return graph;
|
|
197
206
|
}
|
|
207
|
+
resolveResourceIdentity(identity, identityToGraphIds, sourceResource) {
|
|
208
|
+
const sourceResourceId = sourceResource.id;
|
|
209
|
+
const scopedTarget = getMetadataField(sourceResource, 'resourceAliasTargets')?.[identity];
|
|
210
|
+
if (scopedTarget) {
|
|
211
|
+
const scopedOwners = identityToGraphIds.get(scopedTarget);
|
|
212
|
+
if (scopedOwners?.size === 1)
|
|
213
|
+
return scopedOwners.values().next().value;
|
|
214
|
+
}
|
|
215
|
+
const owners = identityToGraphIds.get(identity);
|
|
216
|
+
if (!owners || owners.size === 0)
|
|
217
|
+
return undefined;
|
|
218
|
+
if (owners.size > 1) {
|
|
219
|
+
throw new TypeKroError(`Resource identity '${identity}' referenced by '${sourceResourceId}' is ambiguous between resources ${[
|
|
220
|
+
...owners,
|
|
221
|
+
]
|
|
222
|
+
.map((owner) => `'${owner}'`)
|
|
223
|
+
.join(' and ')}`, 'AMBIGUOUS_DEPENDENCY_REFERENCE', {
|
|
224
|
+
sourceResourceId,
|
|
225
|
+
referencedResourceId: identity,
|
|
226
|
+
owners: [...owners],
|
|
227
|
+
});
|
|
228
|
+
}
|
|
229
|
+
return owners.values().next().value;
|
|
230
|
+
}
|
|
198
231
|
/**
|
|
199
232
|
* Collect string values from a resource's container env vars and
|
|
200
233
|
* connection-string-like fields. Focused extraction avoids false
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/core/dependencies/resolver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/core/dependencies/resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,19 @@
|
|
|
1
1
|
import type { KubeConfig, KubernetesObject } from '@kubernetes/client-node';
|
|
2
2
|
import { createBunCompatibleKubernetesObjectApi } from '../kubernetes/index.js';
|
|
3
3
|
type MigrationApi = Pick<ReturnType<typeof createBunCompatibleKubernetesObjectApi>, 'read' | 'list' | 'replace'>;
|
|
4
|
+
/**
|
|
5
|
+
* Repairs KRO's retained-CRD adoption edge after an RGD is recreated.
|
|
6
|
+
*
|
|
7
|
+
* KRO 0.9.2 recognizes a generated CRD with the same RGD name and a stale RGD
|
|
8
|
+
* UID as adoptable. When its schema and names are otherwise unchanged, however,
|
|
9
|
+
* KRO returns before patching the ownership labels. The dynamic instance
|
|
10
|
+
* controller can then disappear while terminating instances retain KRO's
|
|
11
|
+
* finalizer indefinitely. TypeKro deliberately retains generated CRDs for safe
|
|
12
|
+
* reuse, so it must close that adoption gap until KRO does so itself.
|
|
13
|
+
*/
|
|
14
|
+
export declare function repairRetainedKroGeneratedCrdOwnership(kubeConfig: KubeConfig, desiredResource: KubernetesObject, dependencies?: {
|
|
15
|
+
readonly api?: MigrationApi;
|
|
16
|
+
}): Promise<void>;
|
|
4
17
|
/**
|
|
5
18
|
* Broadens the generated CRD's released v0.32 artifact-binding schema before
|
|
6
19
|
* KRO sees the topology-independent RGD. KRO rejects a direct fixed-object →
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kro-artifact-binding-migration.d.ts","sourceRoot":"","sources":["../../../src/core/deployment/kro-artifact-binding-migration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE5E,OAAO,EACL,sCAAsC,EAEvC,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"kro-artifact-binding-migration.d.ts","sourceRoot":"","sources":["../../../src/core/deployment/kro-artifact-binding-migration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE5E,OAAO,EACL,sCAAsC,EAEvC,MAAM,wBAAwB,CAAC;AAQhC,KAAK,YAAY,GAAG,IAAI,CACtB,UAAU,CAAC,OAAO,sCAAsC,CAAC,EACzD,MAAM,GAAG,MAAM,GAAG,SAAS,CAC5B,CAAC;AA+MF;;;;;;;;;GASG;AACH,wBAAsB,sCAAsC,CAC1D,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,gBAAgB,EACjC,YAAY,GAAE;IAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,YAAY,CAAA;CAAO,GACjD,OAAO,CAAC,IAAI,CAAC,CAmEf;AAED;;;;;;GAMG;AACH,wBAAsB,kCAAkC,CACtD,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,gBAAgB,EACjC,YAAY,GAAE;IAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,YAAY,CAAA;CAAO,GACjD,OAAO,CAAC,IAAI,CAAC,CA4Gf"}
|
|
@@ -3,6 +3,9 @@ import { createBunCompatibleKubernetesObjectApi, getErrorStatusCode, } from '../
|
|
|
3
3
|
import { KRO_ARTIFACT_BINDINGS_SPEC_FIELD } from '../planning/values.js';
|
|
4
4
|
const STABLE_BINDING_SCHEMA = 'map[string]map[string]string';
|
|
5
5
|
const MAX_CRD_PATCH_ATTEMPTS = 5;
|
|
6
|
+
const KRO_OWNED_LABEL = 'kro.run/owned';
|
|
7
|
+
const KRO_RGD_ID_LABEL = 'kro.run/resource-graph-definition-id';
|
|
8
|
+
const KRO_RGD_NAME_LABEL = 'kro.run/resource-graph-definition-name';
|
|
6
9
|
async function findGeneratedCrd(api, group, kind) {
|
|
7
10
|
const listed = (await api.list('apiextensions.k8s.io/v1', 'CustomResourceDefinition'));
|
|
8
11
|
return listed.items?.find((candidate) => candidate.spec?.group === group && candidate.spec?.names?.kind === kind);
|
|
@@ -112,7 +115,7 @@ async function replaceRgdWithRetry(api, rgdName, desired, initialLive) {
|
|
|
112
115
|
}
|
|
113
116
|
throw new Error(`Could not replace ResourceGraphDefinition ${rgdName}`);
|
|
114
117
|
}
|
|
115
|
-
async function requestRgdReconcile(api, rgdName) {
|
|
118
|
+
async function requestRgdReconcile(api, rgdName, reason = 'artifact-binding-migration') {
|
|
116
119
|
const live = (await api.read({
|
|
117
120
|
apiVersion: 'kro.run/v1alpha1',
|
|
118
121
|
kind: 'ResourceGraphDefinition',
|
|
@@ -123,11 +126,79 @@ async function requestRgdReconcile(api, rgdName) {
|
|
|
123
126
|
name: rgdName,
|
|
124
127
|
annotations: {
|
|
125
128
|
...live.metadata?.annotations,
|
|
126
|
-
|
|
129
|
+
[`typekro.io/${reason}-retry`]: new Date().toISOString(),
|
|
127
130
|
},
|
|
128
131
|
},
|
|
129
132
|
}, live);
|
|
130
133
|
}
|
|
134
|
+
/**
|
|
135
|
+
* Repairs KRO's retained-CRD adoption edge after an RGD is recreated.
|
|
136
|
+
*
|
|
137
|
+
* KRO 0.9.2 recognizes a generated CRD with the same RGD name and a stale RGD
|
|
138
|
+
* UID as adoptable. When its schema and names are otherwise unchanged, however,
|
|
139
|
+
* KRO returns before patching the ownership labels. The dynamic instance
|
|
140
|
+
* controller can then disappear while terminating instances retain KRO's
|
|
141
|
+
* finalizer indefinitely. TypeKro deliberately retains generated CRDs for safe
|
|
142
|
+
* reuse, so it must close that adoption gap until KRO does so itself.
|
|
143
|
+
*/
|
|
144
|
+
export async function repairRetainedKroGeneratedCrdOwnership(kubeConfig, desiredResource, dependencies = {}) {
|
|
145
|
+
const desiredRgd = desiredResource;
|
|
146
|
+
const rgdName = desiredRgd.metadata?.name;
|
|
147
|
+
const apiVersion = desiredRgd.spec?.schema?.apiVersion;
|
|
148
|
+
const kind = desiredRgd.spec?.schema?.kind;
|
|
149
|
+
if (!rgdName || !apiVersion || !kind)
|
|
150
|
+
return;
|
|
151
|
+
const api = dependencies.api ?? createBunCompatibleKubernetesObjectApi(kubeConfig);
|
|
152
|
+
const liveRgd = (await api.read({
|
|
153
|
+
apiVersion: 'kro.run/v1alpha1',
|
|
154
|
+
kind: 'ResourceGraphDefinition',
|
|
155
|
+
metadata: { name: rgdName },
|
|
156
|
+
}));
|
|
157
|
+
const liveRgdUid = liveRgd.metadata?.uid;
|
|
158
|
+
if (!liveRgdUid) {
|
|
159
|
+
throw new Error(`Cannot adopt the retained generated CRD for ${rgdName}: the live ResourceGraphDefinition has no UID`);
|
|
160
|
+
}
|
|
161
|
+
const group = desiredRgd.spec?.schema?.group ??
|
|
162
|
+
(apiVersion.includes('/') ? apiVersion.slice(0, apiVersion.lastIndexOf('/')) : 'kro.run');
|
|
163
|
+
for (let attempt = 1; attempt <= MAX_CRD_PATCH_ATTEMPTS; attempt += 1) {
|
|
164
|
+
const crd = await findGeneratedCrd(api, group, kind);
|
|
165
|
+
if (!crd?.metadata?.name)
|
|
166
|
+
return;
|
|
167
|
+
const labels = crd.metadata.labels ?? {};
|
|
168
|
+
if (labels[KRO_OWNED_LABEL] !== 'true') {
|
|
169
|
+
throw new Error(`Cannot adopt generated CRD ${crd.metadata.name} for ResourceGraphDefinition ${rgdName}: the CRD is not marked as KRO-owned`);
|
|
170
|
+
}
|
|
171
|
+
if (labels[KRO_RGD_NAME_LABEL] !== rgdName) {
|
|
172
|
+
throw new Error(`Cannot adopt generated CRD ${crd.metadata.name} for ResourceGraphDefinition ${rgdName}: it belongs to ${labels[KRO_RGD_NAME_LABEL] ?? 'an unknown ResourceGraphDefinition'}`);
|
|
173
|
+
}
|
|
174
|
+
if (labels[KRO_RGD_ID_LABEL] === liveRgdUid)
|
|
175
|
+
return;
|
|
176
|
+
if (!crd.metadata.resourceVersion) {
|
|
177
|
+
throw new Error(`Cannot adopt generated CRD ${crd.metadata.name}: the live resource has no resourceVersion`);
|
|
178
|
+
}
|
|
179
|
+
try {
|
|
180
|
+
await api.replace({
|
|
181
|
+
...crd,
|
|
182
|
+
apiVersion: 'apiextensions.k8s.io/v1',
|
|
183
|
+
kind: 'CustomResourceDefinition',
|
|
184
|
+
metadata: {
|
|
185
|
+
...crd.metadata,
|
|
186
|
+
labels: {
|
|
187
|
+
...labels,
|
|
188
|
+
[KRO_RGD_ID_LABEL]: liveRgdUid,
|
|
189
|
+
},
|
|
190
|
+
},
|
|
191
|
+
});
|
|
192
|
+
await requestRgdReconcile(api, rgdName, 'retained-crd-adoption');
|
|
193
|
+
return;
|
|
194
|
+
}
|
|
195
|
+
catch (error) {
|
|
196
|
+
if (getErrorStatusCode(error) !== 409 || attempt === MAX_CRD_PATCH_ATTEMPTS) {
|
|
197
|
+
throw new Error(`Could not adopt generated CRD ${crd.metadata.name} for ResourceGraphDefinition ${rgdName} after ${attempt} attempt${attempt === 1 ? '' : 's'}: ${ensureError(error).message}`);
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
}
|
|
131
202
|
/**
|
|
132
203
|
* Broadens the generated CRD's released v0.32 artifact-binding schema before
|
|
133
204
|
* KRO sees the topology-independent RGD. KRO rejects a direct fixed-object →
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kro-artifact-binding-migration.js","sourceRoot":"","sources":["../../../src/core/deployment/kro-artifact-binding-migration.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"kro-artifact-binding-migration.js","sourceRoot":"","sources":["../../../src/core/deployment/kro-artifact-binding-migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -458,6 +458,7 @@ export declare class KroResourceFactoryImpl<TSpec extends KroCompatibleType, TSt
|
|
|
458
458
|
*/
|
|
459
459
|
private addRgdSchemaStatusPruneMarkers;
|
|
460
460
|
private migrateLegacyArtifactBindings;
|
|
461
|
+
private repairRetainedCrdOwnership;
|
|
461
462
|
/**
|
|
462
463
|
* Ensure the ResourceGraphDefinition is deployed using DirectDeploymentEngine.
|
|
463
464
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kro-factory.d.ts","sourceRoot":"","sources":["../../../src/core/deployment/kro-factory.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,OAAO,KAAK,EACV,0BAA0B,EAE3B,MAAM,wBAAwB,CAAC;AAyChC,OAAO,EA8BL,KAAK,gCAAgC,EAEtC,MAAM,sBAAsB,CAAC;AAmB9B,OAAO,KAAK,EAKV,cAAc,EACd,aAAa,EACb,oCAAoC,EACpC,kCAAkC,EAGlC,kBAAkB,EAElB,sBAAsB,EACtB,4BAA4B,EAE5B,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAyB,QAAQ,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAClG,OAAO,KAAK,EACV,iBAAiB,EAEjB,oBAAoB,EACpB,gBAAgB,EAChB,WAAW,EAEZ,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"kro-factory.d.ts","sourceRoot":"","sources":["../../../src/core/deployment/kro-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ import { blockerForRemainingResource, createDeletionResultState, deletionTarget,
|
|
|
40
40
|
import { DirectDeploymentEngine } from './engine.js';
|
|
41
41
|
import { logHandleSnapshot } from './handle-tracing.js';
|
|
42
42
|
import { isNotFoundError } from './k8s-helpers.js';
|
|
43
|
-
import { migrateLegacyKroArtifactBindingCrd } from './kro-artifact-binding-migration.js';
|
|
43
|
+
import { migrateLegacyKroArtifactBindingCrd, repairRetainedKroGeneratedCrdOwnership, } from './kro-artifact-binding-migration.js';
|
|
44
44
|
import { assertKroInstanceSpecPreserved } from './kro-instance-admission.js';
|
|
45
45
|
import { assertKroInstanceNamespaceOwnershipSafe, assertNoHoistWeakenedStatusFields, concreteActiveOwnedResources, concreteOwnedNamespaceResources, findDanglingHoistedReference, resolveConcreteMetadataValue, resolveNamespaceName, rewriteHoistedNamespaceReferences, rewriteHoistedNamespaceRefsInValue, selectHoistedNamespaces, } from './kro-instance-safety.js';
|
|
46
46
|
import { decideNamespaceOwnershipCreateFirst, deleteNamespaceIfEmpty, HOISTED_NAMESPACES_ANNOTATION, listNamespacesOwnedByRgd, NAMESPACE_OWNER_ANNOTATION, parseHoistedNamespacesAnnotation, readHoistedNamespacesRecord, } from './kro-namespace-teardown.js';
|
|
@@ -1476,6 +1476,7 @@ export class KroResourceFactoryImpl {
|
|
|
1476
1476
|
timeout: member.factory.factoryOptions.timeout || DEFAULT_RGD_TIMEOUT,
|
|
1477
1477
|
...(abortSignal ? { abortSignal } : {}),
|
|
1478
1478
|
});
|
|
1479
|
+
await member.factory.repairRetainedCrdOwnership(resource);
|
|
1479
1480
|
await member.factory.waitForCRDReadyWithEngine(deploymentEngine, abortSignal);
|
|
1480
1481
|
continue;
|
|
1481
1482
|
}
|
|
@@ -2758,7 +2759,8 @@ export class KroResourceFactoryImpl {
|
|
|
2758
2759
|
return this.alchemyDeclarationsFromKroArtifactBundle(compiledBundle.bundle, kubeConfigOptions, compiledBundle.sensitiveBindings);
|
|
2759
2760
|
}
|
|
2760
2761
|
this.assertBundleCapabilities(undefined, { host: 'alchemy', output: 'live' });
|
|
2761
|
-
const
|
|
2762
|
+
const instanceName = opts?.instanceNameOverride ?? generateInstanceName(spec, this.name);
|
|
2763
|
+
const kroDeletion = this.createAlchemyKroDeletionOptions(instanceNamespace, instanceName);
|
|
2762
2764
|
const prerequisiteDeclarations = this.prerequisiteAlchemyDeclarations(kubeConfigOptions);
|
|
2763
2765
|
const prerequisiteIds = prerequisiteDeclarations.map((decl) => decl.id);
|
|
2764
2766
|
// Every Namespace the composition owns is HOISTED out of the RGD graph and
|
|
@@ -2841,7 +2843,6 @@ export class KroResourceFactoryImpl {
|
|
|
2841
2843
|
};
|
|
2842
2844
|
// 2. CR instance declaration (one per deploy call). Depends on the RGD so alchemy applies the
|
|
2843
2845
|
// instance only after the RGD's CRD is established (else the CR apply races a missing kind).
|
|
2844
|
-
const instanceName = opts?.instanceNameOverride ?? generateInstanceName(spec, this.name);
|
|
2845
2846
|
const crdInstanceManifest = this.createCustomResourceInstance(instanceName, spec, opts?.singletonSpecFingerprint);
|
|
2846
2847
|
// Cast: a plain KubernetesResource is fine — the alchemy path only reads kind/metadata.
|
|
2847
2848
|
const crdAsEnhanced = crdInstanceManifest;
|
|
@@ -2907,13 +2908,14 @@ export class KroResourceFactoryImpl {
|
|
|
2907
2908
|
});
|
|
2908
2909
|
}
|
|
2909
2910
|
/** Build the finalizer-safe, shared-RGD-aware deletion metadata for this factory's instances. */
|
|
2910
|
-
createAlchemyKroDeletionOptions(instanceNamespace = this.namespace) {
|
|
2911
|
+
createAlchemyKroDeletionOptions(instanceNamespace = this.namespace, instanceName) {
|
|
2911
2912
|
return {
|
|
2912
2913
|
apiVersion: this.schemaDefinition.apiVersion,
|
|
2913
2914
|
kind: this.schemaDefinition.kind,
|
|
2914
2915
|
...(this.schemaDefinition.group && { group: this.schemaDefinition.group }),
|
|
2915
2916
|
namespace: instanceNamespace,
|
|
2916
2917
|
rgdName: this.rgdName,
|
|
2918
|
+
...(instanceName ? { instanceName } : {}),
|
|
2917
2919
|
...(this.discoveredPlural && { plural: this.discoveredPlural }),
|
|
2918
2920
|
timeout: this.factoryOptions.timeout ?? 300000,
|
|
2919
2921
|
};
|
|
@@ -2948,6 +2950,7 @@ export class KroResourceFactoryImpl {
|
|
|
2948
2950
|
? String(materializePlanValue(instanceIdentity.namespace))
|
|
2949
2951
|
: this.namespace,
|
|
2950
2952
|
rgdName: String(materializePlanValue(rgdIdentity.name)),
|
|
2953
|
+
instanceName: String(materializePlanValue(instanceIdentity.name)),
|
|
2951
2954
|
...(group ? { group } : {}),
|
|
2952
2955
|
timeout: this.factoryOptions.timeout ?? 300000,
|
|
2953
2956
|
};
|
|
@@ -3513,6 +3516,9 @@ export class KroResourceFactoryImpl {
|
|
|
3513
3516
|
async migrateLegacyArtifactBindings(rgdManifest) {
|
|
3514
3517
|
await migrateLegacyKroArtifactBindingCrd(this.getKubeConfig(), rgdManifest);
|
|
3515
3518
|
}
|
|
3519
|
+
async repairRetainedCrdOwnership(rgdManifest) {
|
|
3520
|
+
await repairRetainedKroGeneratedCrdOwnership(this.getKubeConfig(), rgdManifest);
|
|
3521
|
+
}
|
|
3516
3522
|
/**
|
|
3517
3523
|
* Ensure the ResourceGraphDefinition is deployed using DirectDeploymentEngine.
|
|
3518
3524
|
*
|
|
@@ -3573,6 +3579,7 @@ export class KroResourceFactoryImpl {
|
|
|
3573
3579
|
timeout: this.factoryOptions.timeout || DEFAULT_RGD_TIMEOUT,
|
|
3574
3580
|
...(abortSignal ? { abortSignal } : {}),
|
|
3575
3581
|
});
|
|
3582
|
+
await this.repairRetainedCrdOwnership(rgdWithMetadata);
|
|
3576
3583
|
this.logger.info('RGD accepted, waiting for CRD', { rgdName: this.rgdName });
|
|
3577
3584
|
// Wait for the CRD to be created by Kro using DirectDeploymentEngine
|
|
3578
3585
|
await this.waitForCRDReadyWithEngine(deploymentEngine, abortSignal);
|