Skip to content

Commit 2053b2c

Browse files
authored
fix: set kind during the list operation (#400)
Signed-off-by: Philippe Martin <[email protected]>
1 parent b45413a commit 2053b2c

16 files changed

+18
-23
lines changed

packages/extension/src/manager/contexts-manager.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -874,8 +874,8 @@ describe('HealthChecker pass and PermissionsChecker resturns a value', async ()
874874
list: listMock,
875875
get: getMock,
876876
} as ObjectCache<KubernetesObject>);
877-
listMock.mockReturnValue([{ metadata: { name: 'obj1', namespace: 'ns1' } }]);
878-
getMock.mockReturnValue({ metadata: { name: 'obj1', namespace: 'ns1' } });
877+
listMock.mockReturnValue([{ kind: 'Resource1', metadata: { name: 'obj1', namespace: 'ns1' } }]);
878+
getMock.mockReturnValue({ kind: 'Resource1', metadata: { name: 'obj1', namespace: 'ns1' } });
879879
await manager.update(kc);
880880

881881
const result = manager.getResourceDetails('context1', 'resource1', 'obj1', 'ns1');
@@ -889,7 +889,7 @@ describe('HealthChecker pass and PermissionsChecker resturns a value', async ()
889889
list: listMock,
890890
get: getMock,
891891
} as ObjectCache<KubernetesObject>);
892-
listMock.mockReturnValue([{ metadata: { name: 'obj1', namespace: 'ns1' } }]);
892+
listMock.mockReturnValue([{ kind: 'Resource1', metadata: { name: 'obj1', namespace: 'ns1' } }]);
893893
getMock.mockReturnValue(undefined);
894894
await manager.update(kc);
895895

packages/extension/src/manager/contexts-manager.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,7 @@ export class ContextsManager {
278278
namespace?: string,
279279
): KubernetesObject | undefined {
280280
const value = this.#objectCaches.get(contextName, resourceName);
281-
let details = value?.get(name, namespace);
282-
if (details) {
283-
const kind = this.#resourceFactoryHandler.getResourceFactoryByResourceName(resourceName)?.kind;
284-
details = { ...details, kind };
285-
}
286-
return details;
281+
return value?.get(name, namespace);
287282
}
288283

289284
getResourceEvents(contextName: string, uid: string): CoreV1Event[] {

packages/extension/src/resources/configmaps-resource-factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class ConfigmapsResourceFactory extends ResourceFactoryBase implements Re
4646
],
4747
});
4848
this.setInformer({
49-
createInformer: this.createInformer,
49+
createInformer: this.createInformer.bind(this),
5050
});
5151
this.setDeleteObject(this.deleteConfigMap);
5252
}

packages/extension/src/resources/cronjobs-resource-factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class CronjobsResourceFactory extends ResourceFactoryBase implements Reso
4747
],
4848
});
4949
this.setInformer({
50-
createInformer: this.createInformer,
50+
createInformer: this.createInformer.bind(this),
5151
});
5252
this.setDeleteObject(this.deleteCronJob);
5353
}

packages/extension/src/resources/deployments-resource-factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class DeploymentsResourceFactory extends ResourceFactoryBase implements R
4747
],
4848
});
4949
this.setInformer({
50-
createInformer: this.createInformer,
50+
createInformer: this.createInformer.bind(this),
5151
});
5252
this.setIsActive(this.isDeploymentActive);
5353
this.setDeleteObject(this.deleteDeployment);

packages/extension/src/resources/endpoint-slices-resource-factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class EndpointSlicesResourceFactory extends ResourceFactoryBase implement
5252
],
5353
});
5454
this.setInformer({
55-
createInformer: this.createInformer,
55+
createInformer: this.createInformer.bind(this),
5656
});
5757

5858
this.setSearchByTargetRef(this.searchEndpointSlicesByTargetRef);

packages/extension/src/resources/events-resource-factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class EventsResourceFactory extends ResourceFactoryBase implements Resour
4646
],
4747
});
4848
this.setInformer({
49-
createInformer: this.createInformer,
49+
createInformer: this.createInformer.bind(this),
5050
});
5151
}
5252

packages/extension/src/resources/ingresses-resource-factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export class IngressesResourceFactory extends ResourceFactoryBase implements Res
4949
],
5050
});
5151
this.setInformer({
52-
createInformer: this.createInformer,
52+
createInformer: this.createInformer.bind(this),
5353
});
5454
this.setDeleteObject(this.deleteIngress);
5555
this.setSearchByTargetRef(this.searchIngressesByTargetRef);

packages/extension/src/resources/jobs-resource-factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class JobsResourceFactory extends ResourceFactoryBase implements Resource
4848
],
4949
});
5050
this.setInformer({
51-
createInformer: this.createInformer,
51+
createInformer: this.createInformer.bind(this),
5252
});
5353
this.setDeleteObject(this.deleteJob);
5454
this.setReadObject(this.readJob);

packages/extension/src/resources/namespaces-resource-factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class NamespacesResourceFactory extends ResourceFactoryBase implements Re
5151
],
5252
});
5353
this.setInformer({
54-
createInformer: this.createInformer,
54+
createInformer: this.createInformer.bind(this),
5555
});
5656
this.setDeleteObject(this.deleteNamespace);
5757
this.setSearchBySelector(this.searchNamespacesBySelector);

0 commit comments

Comments
 (0)