quieter logs

weaveworks · Jul 20, 2023 · 28dad38 · 28dad38
1 parent 4b9e39a
commit 28dad38
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 69 deletions.
diff --git a/src/cli/kubernetes/kubectlGet.ts b/src/cli/kubernetes/kubectlGet.ts
@@ -44,12 +44,11 @@ export async function getResourcesAllNamespaces<T extends KubernetesObject>(kind
 
 	const list = await k8sList(kind);
 	if(list !== undefined) {
-		console.log(`k8sList ${kind}`, list);
+		console.log(`k8sList ${kind}`, list.length);
 		console.log(`list ${kind} ∆`, Date.now() - t1);
 		return list as T[];
 	}
 
-	console.log(`kubectl get ${kind}`);
 
 	const shellResult = await invokeKubectlCommand(`get ${kind} -A -o json`);
 
@@ -61,8 +60,10 @@ export async function getResourcesAllNamespaces<T extends KubernetesObject>(kind
 		return [];
 	}
 
+	const items = parseJsonItems(shellResult.stdout);
+	console.log(`kubectl get ${kind}`, items.length);
 	console.log(`list ${kind} ∆`, Date.now() - t1);
-	return parseJsonItems(shellResult.stdout);
+	return items as T[];
 }
 
 

diff --git a/src/k8s/informers.ts b/src/k8s/informers.ts
@@ -58,24 +58,19 @@ async function createInformer(kc: k8s.KubeConfig, receiver: KubernetesObjectData
 
 function registerInformerEvents(informer: k8s.Informer<KubernetesObject>, receiver: KubernetesObjectDataProvider) {
 	informer?.on('add', (obj: KubernetesObject) => {
-		// console.log('*- informer Add', obj);
 		receiver.add(obj);
 	});
 
 	informer?.on('update', (obj: KubernetesObject) => {
-		// console.log('*- informer Update', obj);
 		receiver.update(obj);
 	});
 
 	informer?.on('delete', (obj: KubernetesObject) => {
-		// console.log('*- informer Delete ', obj);
 		receiver.delete(obj);
 	});
 
 	informer?.on('error', (err: Error) => {
 		console.log('*- informer Error', err);
 		destroyInformers();
 	});
-
-	// console.log('*- informer listening for events...');
 }
diff --git a/src/k8s/list.ts b/src/k8s/list.ts
@@ -45,54 +45,3 @@ export async function k8sListNamespaces(): Promise<Namespace[] | undefined> {
 		return;
 	}
 }
-
-
-
-// will start a self-healing informer for each resource type and namespaces
-// function createInformer(kind: Kind, kubeConfig: k8s.KubeConfig) {
-// 	// const k8sCoreApi = kubeConfig.makeApiClient(k8s.CoreV1Api);
-// 	// k8sCoreApi.listNamespace()
-
-// 	const k8sCustomApi = kubeConfig.makeApiClient(k8s.CustomObjectsApi);
-
-// 	const api = getAPIParams(kind);
-// 	if(!api) {
-// 		return;
-// 	}
-
-// 	const listFn = async () => {
-// 		const result = await k8sCustomApi.listClusterCustomObject(api.group, api.version, api.plural);
-// 		const kbody = result.body as KubernetesListObject<GitRepository>;
-// 		return Promise.resolve({response: result.response, body: kbody});
-// 	};
-
-// 	const k8sinformer = k8s.makeInformer(
-// 		kubeConfig,
-// 		`/apis/${api.group}/${api.version}/${api.plural}`,
-// 		listFn,
-// 	);
-
-// 	return k8sinformer;
-// }
-
-// function registerInformerEvents() {
-// 	informer?.on('add', (obj: KubernetesObject) => {
-// 		// console.log('informer add event', obj);
-// 		sourceDataProvider.add(obj);
-// 	});
-
-// 	informer?.on('update', (obj: KubernetesObject) => {
-// 		// console.log('informer update event', obj);
-// 		sourceDataProvider.update(obj);
-// 	});
-
-// 	informer?.on('delete', (obj: KubernetesObject) => {
-// 		// console.log('informer delete event', obj);
-// 		sourceDataProvider.delete(obj);
-// 	});
-// 	console.log('informer listening for events...');
-
-// }
-
-
-
diff --git a/src/ui/treeviews/dataProviders/kubernetesObjectDataProvider.ts b/src/ui/treeviews/dataProviders/kubernetesObjectDataProvider.ts
@@ -61,23 +61,13 @@ export abstract class KubernetesObjectDataProvider extends DataProvider {
 	}
 
 	public update(object: KubernetesObject) {
-		// console.log('update', object);
-		// console.log('treeitems', this.treeItems);
-
-
 		const namespaceNode = this.findParentNamespaceNode(object);
 		if(!namespaceNode) {
 			return;
 		}
 
 		const node = namespaceNode.findChildByResource(object);
 		if(node && node.resource) {
-			// console.log('old', node.resource?.metadata, node.resource?.spec, node.resource?.status);
-			// console.log('new', object.metadata, object.spec, object.status);
-			// console.log('equals?',
-			// 	deepEqual(node.resource?.metadata, object.metadata),
-			// 	deepEqual(node.resource?.spec, object.spec),
-			// 	deepEqual(node.resource?.status, object.status));
 			node.resource = object;
 			node.updateStatus();
 			this._onDidChangeTreeData.fire(node);