Merge pull request #18 from bryopsida/12-populate-correct-architecture

Populate node arch

Author: bryopsida

.env

@@ -0,0 +1,4 @@
+    PATCHWORK_REDIS_HOST=localhost
+    PATCHWORK_REDIS_PORT=6379
+    PATCHWORK_UPDATE_CRON="* * * * *"
+    

charts/patchwork/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: patchwork
 description: A Helm chart for Kubernetes
 type: application
-version: 0.3.0
-appVersion: '0.1.0'
+version: 0.4.0
+appVersion: '0.2.0'
 dependencies:
   - name: redis
     repository: https://groundhog2k.github.io/helm-charts/

charts/patchwork/README.md

@@ -1,6 +1,6 @@
 # patchwork
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.0](https://img.shields.io/badge/AppVersion-0.2.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchwork",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "",
   "author": "",
   "private": true,

src/analyzer/image-list.consumer.ts

@@ -20,7 +20,7 @@ export class ImageListWorker {
   @Process()
   async fetchImageList(job: Job<unknown>) {
     try {
-      this.logger.debug('Fetching list of images')
+      this.logger.log('Fetching list of images')
       const images = await this.k8sService.getImageList()
       this.logger.debug('Found images', images)
       // push jobs into the queue

src/analyzer/task-register.service.ts

@@ -14,12 +14,16 @@ export class TaskRegisterService {
 
   @Timeout(5000)
   async handleTimeout(): Promise<void> {
-    this.logger.log('Ensuring fetch image list job is registered in queue')
+    const cron = process.env.PATCHWORK_UPDATE_CRON ?? '*/30 * * * *'
+    this.logger.log(
+      'Ensuring fetch image list job is registered in queue with cron %s',
+      cron
+    )
     await this.fetchImageListQueue.add(
       {},
       {
         repeat: {
-          cron: process.env.PATCHWORK_UPDATE_CRON ?? '*/30 * * * *',
+          cron,
         },
         attempts: -1,
         backoff: {

src/kubernetes/k8s.service.ts

@@ -10,6 +10,7 @@ import {
   V1Pod,
   V1StatefulSet,
   PatchUtils,
+  V1Node,
 } from '@kubernetes/client-node'
 
 export enum ResourceType {
@@ -46,6 +47,13 @@ function getSelector(
 ): V1LabelSelector {
   return controllerObj.spec.selector
 }
+async function getNode(
+  nodeNode: string,
+  coreClient: CoreV1Api
+): Promise<V1Node> {
+  const node = await coreClient.readNode(nodeNode)
+  return node.body
+}
 
 async function getFirstPod(
   selector: V1LabelSelector,
@@ -115,18 +123,19 @@ async function getImageDescriptors(
   if (pod == null) {
     return null
   }
+  const node = await getNode(pod.spec.nodeName, coreClient)
   return pod.spec.containers.map((container: V1Container): ImageDescriptor => {
     return {
       repository: getImageRepo(container),
       tag: getImageTag(container),
       hash: getImageHash(container, pod),
       // TODO: find nodes with this image in their cache, do not try and use the active pod list which is always in flux during rollouts/scaling etc
-      nodes: [],
+      nodes: [node.metadata.name],
       // For now we are going to sample based on this pod, in the real world their could be mixed usage in non homogenus clusters but
       // we aren't dealing with that yet
       //  TODO: need to pull node information from pod.spec.nodeName and get the arch from its spec.nodeInfo.architecture or spec.metadata.labels.kubernetes.io/arch
       // current test cluster is
-      arch: 'arm64',
+      arch: node.metadata.labels['kubernetes.io/arch'],
       owner: {
         type: getResourceType(controllerObj),
         namespace: controllerObj.metadata.namespace,