adding timeout to the rollout status

Azure · Nov 19, 2024 · 9f7d28b · 9f7d28b
1 parent bf768b3
commit 9f7d28b
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 7 deletions.
diff --git a/src/types/kubectl.test.ts b/src/types/kubectl.test.ts
@@ -371,6 +371,7 @@ describe('Kubectl class', () => {
       it('checks rollout status', async () => {
          const resourceType = 'type'
          const name = 'name'
+         const timeout = '60s'
          expect(await kubectl.checkRolloutStatus(resourceType, name)).toBe(
             execReturn
          )
@@ -399,6 +400,46 @@ describe('Kubectl class', () => {
             ],
             {silent: false}
          )
+
+         // with timeout
+         await kubectl.checkRolloutStatus(
+            resourceType,
+            name,
+            testNamespace,
+            timeout
+         )
+         expect(exec.getExecOutput).toBeCalledWith(
+            kubectlPath,
+            [
+               'rollout',
+               'status',
+               `${resourceType}/${name}`,
+               '--namespace',
+               testNamespace,
+               `--timeout=${timeout}`
+            ],
+            {silent: false}
+         )
+
+         // overridden ns and timeout
+         await kubectl.checkRolloutStatus(
+            resourceType,
+            name,
+            otherNamespace,
+            timeout
+         )
+         expect(exec.getExecOutput).toBeCalledWith(
+            kubectlPath,
+            [
+               'rollout',
+               'status',
+               `${resourceType}/${name}`,
+               '--namespace',
+               otherNamespace,
+               `--timeout=${timeout}`
+            ],
+            {silent: false}
+         )
       })
 
       it('gets resource', async () => {

diff --git a/src/types/kubectl.ts b/src/types/kubectl.ts
@@ -157,13 +157,16 @@ export class Kubectl {
    public async checkRolloutStatus(
       resourceType: string,
       name: string,
-      namespace?: string
+      namespace?: string,
+      timeout?: string
    ): Promise<ExecOutput> {
-      return await this.execute(
-         ['rollout', 'status', `${resourceType}/${name}`].concat(
-            this.getFlags(namespace)
-         )
+      const command = ['rollout', 'status', `${resourceType}/${name}`].concat(
+         this.getFlags(namespace)
       )
+      if (timeout) {
+         command.push(`--timeout=${timeout}`)
+      }
+      return await this.execute(command)
    }
 
    public async getResource(

diff --git a/src/utilities/manifestStabilityUtils.ts b/src/utilities/manifestStabilityUtils.ts
@@ -9,7 +9,8 @@ const POD = 'pod'
 
 export async function checkManifestStability(
    kubectl: Kubectl,
-   resources: Resource[]
+   resources: Resource[],
+   timeout?: string
 ): Promise<void> {
    let rolloutStatusHasErrors = false
    for (let i = 0; i < resources.length; i++) {
@@ -24,7 +25,8 @@ export async function checkManifestStability(
             const result = await kubectl.checkRolloutStatus(
                resource.type,
                resource.name,
-               resource.namespace
+               resource.namespace,
+               timeout
             )
             checkForErrors([result])
          } catch (ex) {