Merge branch 'APL-11' of https://github.com/linode/apl-core into APL-11

Author: j-zimnowoda

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)

tests/bootstrap/input.yaml

@@ -31,9 +31,9 @@ teamConfig:
         trigger: false
         mode:
           docker:
-            repoUrl: https://github.com/redkubes/nodejs-helloworld
+            repoUrl: https://github.com/linode/apl-nodejs-helloworld
             revision: HEAD
-            path: ./Docker
+            path: ./Dockerfile
           type: docker
       - name: demo-java-maven
         tag: v0.0.1
@@ -44,15 +44,6 @@ teamConfig:
             revision: HEAD
             path: apps/java-maven
           type: buildpacks
-      - name: demo-java-trigger
-        tag: v_0_0_1
-        trigger: true
-        mode:
-          docker:
-            repoUrl: https://github.com/buildpacks/samples
-            revision: HEAD
-            path: ./Docker
-          type: docker
     services:
       - headers:
           response:
@@ -81,7 +72,7 @@ teamConfig:
         type: public
     workloads:
       - name: nodejs-helloworld
-        url: https://github.com/redkubes/nodejs-helloworld.git
+        url: https://github.com/linode/apl-nodejs-helloworld.git
         path: ./
         revision: HEAD
       - name: httpbin

tests/fixtures/env/teams/builds.demo.yaml

@@ -8,7 +8,7 @@ teamConfig:
                   docker:
                       repoUrl: https://github.com/buildpacks/samples
                       revision: HEAD
-                      path: ./Docker
+                      path: ./Dockerfile
                   type: docker
               externalRepo: false
               scanSource: true

tests/integration/minimal-with-team.yaml

@@ -30,9 +30,9 @@ teamConfig:
         trigger: false
         mode:
           docker:
-            repoUrl: https://github.com/redkubes/nodejs-helloworld
+            repoUrl: https://github.com/linode/apl-nodejs-helloworld
             revision: HEAD
-            path: ./Docker
+            path: ./Dockerfile
           type: docker
       - name: demo-java-maven
         tag: v0.0.1
@@ -43,15 +43,6 @@ teamConfig:
             revision: HEAD
             path: apps/java-maven
           type: buildpacks
-      - name: demo-java-trigger
-        tag: v_0_0_1
-        trigger: true
-        mode:
-          docker:
-            repoUrl: https://github.com/buildpacks/samples
-            revision: HEAD
-            path: ./Docker
-          type: docker
     services:
       - headers:
           response:
@@ -80,7 +71,7 @@ teamConfig:
         type: public
     workloads:
       - name: nodejs-helloworld
-        url: https://github.com/redkubes/nodejs-helloworld.git
+        url: https://github.com/linode/apl-nodejs-helloworld.git
         path: ./
         revision: HEAD
       - name: httpbin
@@ -101,7 +92,7 @@ teamConfig:
     services: []
     workloads:
       - name: nodejs-helloworld
-        url: https://github.com/redkubes/nodejs-helloworld.git
+        url: https://github.com/linode/apl-nodejs-helloworld.git
         path: ./
         revision: HEAD
 files:

tests/integration/upgrade.yaml

@@ -61,9 +61,9 @@ teamConfig:
         tag: v0.0.1
         mode:
           docker:
-            repoUrl: https://github.com/redkubes/nodejs-helloworld
+            repoUrl: https://github.com/linode/apl-nodejs-helloworld
             revision: HEAD
-            path: ./Docker
+            path: ./Dockerfile
           type: docker
       - name: demo-java-maven
         tag: v0.0.1
@@ -110,7 +110,7 @@ teamConfig:
         type: public
     workloads:
       - name: nodejs-helloworld
-        url: https://github.com/redkubes/nodejs-helloworld.git
+        url: https://github.com/linode/apl-nodejs-helloworld.git
         path: /
         revision: HEAD
       - name: httpbin
@@ -131,7 +131,7 @@ teamConfig:
     services: []
     workloads:
       - name: nodejs-helloworld
-        url: https://github.com/redkubes/nodejs-helloworld.git
+        url: https://github.com/linode/apl-nodejs-helloworld.git
         path: /
         revision: HEAD
 files: