fix: resource check for argocd controller (#1836)

Co-authored-by: jeho <[email protected]>

Author: CasLubbers

src/common/k8s.test.ts

@@ -160,12 +160,11 @@ describe('StatefulSet tests', () => {
         ),
       ).resolves.not.toThrow()
 
-      expect(debug).toHaveBeenNthCalledWith(1, 'sts/argocd-application-controller pod has not desired resources')
       expect(debug).toHaveBeenNthCalledWith(
-        2,
+        1,
         'sts/argocd-application-controller has been patched with resources: {"requests":{"cpu":"500m","memory":"1Gi"},"limits":{"cpu":"1","memory":"2Gi"}}',
       )
-      expect(debug).toHaveBeenNthCalledWith(3, 'sts/argocd-application-controller pods restarted')
+      expect(debug).toHaveBeenNthCalledWith(2, 'sts/argocd-application-controller pods restarted')
     })
 
     it('should log an error if no pods are found', async () => {
@@ -218,7 +217,7 @@ describe('StatefulSet tests', () => {
         mockDebugger,
       )
 
-      expect(debug).toBeCalledTimes(0)
+      expect(debug).toBeCalledTimes(1)
     })
 
     it('should log an error if an exception occurs', async () => {

src/common/k8s.ts

@@ -5,7 +5,7 @@ import { AnyAaaaRecord, AnyARecord } from 'dns'
 import { resolveAny } from 'dns/promises'
 import { access, mkdir, writeFile } from 'fs/promises'
 import { Agent } from 'https'
-import { isEmpty, map, mapValues } from 'lodash'
+import { isEmpty, isEqual, map, mapValues } from 'lodash'
 import fetch, { RequestInit } from 'node-fetch'
 import { dirname, join } from 'path'
 import { parse, stringify } from 'yaml'
@@ -371,15 +371,23 @@ export async function patchContainerResourcesOfSts(
     for (const pod of pods.items) {
       const actualResources = pod.spec?.containers?.find((container) => container.name === containerName)?.resources
 
-      if (actualResources != desiredResources) {
-        d.info(`sts/argocd-application-controller pod has not desired resources`)
+      if (
+        isEqual(actualResources?.limits, desiredResources?.limits) &&
+        isEqual(actualResources?.requests, desiredResources?.requests)
+      ) {
+        d.info(
+          `sts/argocd-application-controller pod has desired resources: ${JSON.stringify(
+            desiredResources,
+          )} and actual resources: ${JSON.stringify(actualResources)}`,
+        )
+        return
+      }
 
-        await patchStatefulSetResources(statefulSetName, containerName, namespace, desiredResources, appsApi, d)
-        d.info(`sts/argocd-application-controller has been patched with resources: ${JSON.stringify(desiredResources)}`)
+      await patchStatefulSetResources(statefulSetName, containerName, namespace, desiredResources, appsApi, d)
+      d.info(`sts/argocd-application-controller has been patched with resources: ${JSON.stringify(desiredResources)}`)
 
-        await deleteStatefulSetPods(statefulSetName, namespace, appsApi, coreApi, d)
-        d.info(`sts/argocd-application-controller pods restarted`)
-      }
+      await deleteStatefulSetPods(statefulSetName, namespace, appsApi, coreApi, d)
+      d.info(`sts/argocd-application-controller pods restarted`)
     }
   } catch (error) {
     d.error(`Error patching StatefulSet ${statefulSetName}:`, error)