updates to remove recycle of haproxy

Signed-off-by: Jeromy Cannon <[email protected]>

Author: jeromy-cannon

src/commands/network.mjs

@@ -211,7 +211,7 @@ export class NetworkCommand extends BaseCommand {
               subTasks.push({
                 title: `Check HAProxy for: ${chalk.yellow(nodeId)}`,
                 task: () =>
-                  self.k8.waitForPodReady([
+                  self.k8.waitForPods([constants.POD_PHASE_RUNNING], [
                     'fullstack.hedera.com/type=envoy-proxy'
                   ], 1, 60 * 15, 1000) // timeout 15 minutes
               })
@@ -222,7 +222,7 @@ export class NetworkCommand extends BaseCommand {
               subTasks.push({
                 title: `Check Envoy Proxy for: ${chalk.yellow(nodeId)}`,
                 task: () =>
-                  self.k8.waitForPodReady([
+                  self.k8.waitForPods([constants.POD_PHASE_RUNNING], [
                     'fullstack.hedera.com/type=haproxy'
                   ], 1, 60 * 15, 1000) // timeout 15 minutes
               })

src/commands/node.mjs

@@ -706,11 +706,12 @@ export class NodeCommand extends BaseCommand {
         title: 'Check node proxies are ACTIVE',
         task: async (ctx, parentTask) => {
           const subTasks = []
-          let localPort = constants.LOCAL_NODE_PROXY_START_PORT
           for (const nodeId of ctx.config.nodeIds) {
             subTasks.push({
               title: `Check proxy for node: ${chalk.yellow(nodeId)}`,
-              task: async () => await self.checkNetworkNodeProxyUp(nodeId, localPort++)
+              task: async () => await self.k8.waitForPodReady(
+                [`app=haproxy-${nodeId}`, 'fullstack.hedera.com/type=haproxy'],
+                1, 300, 2000)
             })
           }
 
@@ -740,93 +741,6 @@ export class NodeCommand extends BaseCommand {
     return true
   }
 
-  /**
-   * Check if the network node proxy is up, requires close() to be called after
-   * @param nodeId the node id
-   * @param localPort the local port to forward to
-   * @param maxAttempts the maximum number of attempts
-   * @param delay the delay between attempts
-   * @returns {Promise<boolean>} true if the proxy is up
-   */
-  async checkNetworkNodeProxyUp (nodeId, localPort, maxAttempts = 6, delay = 20000) {
-    const podLabels = [`app=haproxy-${nodeId}`, 'fullstack.hedera.com/type=haproxy']
-    let podArray = await this.k8.getPodsByLabel(podLabels)
-
-    let attempts = 0
-    let status = null
-    if (podArray.length > 0) {
-      let podName = podArray[0].metadata.name
-      let portForwarder = null
-
-      try {
-        while (attempts < maxAttempts) {
-          if (attempts === 0) {
-            try {
-              portForwarder = await this.k8.portForward(podName, localPort, 5555)
-            } catch (e) {
-              throw new FullstackTestingError(`failed to portForward for podName ${podName} with localPort ${localPort}: ${e.message}`, e)
-            }
-            try {
-              await this.k8.testConnection('localhost', localPort)
-            } catch (e) {
-              throw new FullstackTestingError(`failed to test connection for podName ${podName} with localPort ${localPort}: ${e.message}`, e)
-            }
-          } else if (attempts % 5 === 0) {
-            this.logger.debug(`Recycling proxy ${podName} [attempt: ${attempts}/${maxAttempts}]`)
-            try {
-              await this.k8.stopPortForward(portForwarder)
-            } catch (e) {
-              throw new FullstackTestingError(`failed to stop portForward for podName ${podName} with localPort ${localPort}: ${e.message}`, e)
-            }
-            try {
-              await this.k8.recyclePodByLabels(podLabels)
-            } catch (e) {
-              throw new FullstackTestingError(`failed to recycle pod for podName ${podName} with localPort ${localPort}: ${e.message}`, e)
-            }
-            podArray = await this.k8.getPodsByLabel(podLabels)
-            podName = podArray[0].metadata.name
-            try {
-              portForwarder = await this.k8.portForward(podName, localPort, 5555)
-            } catch (e) {
-              throw new FullstackTestingError(`failed to portForward for podName ${podName} with localPort ${localPort}: ${e.message}`, e)
-            }
-            try {
-              await this.k8.testConnection('localhost', localPort)
-            } catch (e) {
-              throw new FullstackTestingError(`failed to test connection for podName ${podName} with localPort ${localPort}: ${e.message}`, e)
-            }
-          }
-
-          try {
-            status = await this.getNodeProxyStatus(`http://localhost:${localPort}/v2/services/haproxy/stats/native?type=backend`)
-          } catch (e) {
-            throw new FullstackTestingError(`failed to get proxy status at http://localhost:${localPort}/v2/services/haproxy/stats/native?type=backend: ${e.message}`, e)
-          }
-          if (status === 'UP') {
-            break
-          }
-
-          this.logger.debug(`Proxy ${podName} is not UP. Checking again in ${delay}ms ... [attempt: ${attempts}/${maxAttempts}]`)
-          attempts++
-          await sleep(delay)
-        }
-      } catch (e) {
-        throw new FullstackTestingError(`failed to check proxy for '${nodeId}' with localPort ${localPort}: ${e.message}`, e)
-      } finally {
-        if (portForwarder !== null) {
-          this._portForwards.push(portForwarder)
-        }
-      }
-
-      if (status === 'UP') {
-        this.logger.debug(`Proxy ${podName} is UP. [attempt: ${attempts}/${maxAttempts}]`)
-        return true
-      }
-    }
-
-    throw new FullstackTestingError(`proxy for '${nodeId}' is not UP [ attempt = ${attempts}/${maxAttempts}`)
-  }
-
   async stop (argv) {
     const self = this
 
@@ -1131,11 +1045,12 @@ export class NodeCommand extends BaseCommand {
         // logs will have a lot of white noise from being behind
         task: async (ctx, task) => {
           const subTasks = []
-          let localPort = constants.LOCAL_NODE_PROXY_START_PORT
           for (const nodeId of ctx.config.nodeIds) {
             subTasks.push({
               title: `Check proxy for node: ${chalk.yellow(nodeId)}`,
-              task: async () => await self.checkNetworkNodeProxyUp(nodeId, localPort++)
+              task: async () => await self.k8.waitForPodReady(
+                [`app=haproxy-${nodeId}`, 'fullstack.hedera.com/type=haproxy'],
+                1, 300, 2000)
             })
           }
 
@@ -1474,11 +1389,12 @@ export class NodeCommand extends BaseCommand {
         // logs will have a lot of white noise from being behind
         task: async (ctx, task) => {
           const subTasks = []
-          let localPort = constants.LOCAL_NODE_PROXY_START_PORT
-          for (const nodeId of ctx.config.allNodeIds) {
+          for (const nodeId of ctx.config.nodeIds) {
             subTasks.push({
               title: `Check proxy for node: ${chalk.yellow(nodeId)}`,
-              task: async () => await self.checkNetworkNodeProxyUp(nodeId, localPort++)
+              task: async () => await self.k8.waitForPodReady(
+                [`app=haproxy-${nodeId}`, 'fullstack.hedera.com/type=haproxy'],
+                1, 300, 2000)
             })
           }
 
@@ -1781,33 +1697,6 @@ export class NodeCommand extends BaseCommand {
     }
   }
 
-  async getNodeProxyStatus (url) {
-    try {
-      this.logger.debug(`Fetching proxy status from: ${url}`)
-      const res = await fetch(url, {
-        method: 'GET',
-        signal: AbortSignal.timeout(5000),
-        headers: {
-          Authorization: `Basic ${Buffer.from(
-            `${constants.NODE_PROXY_USER_ID}:${constants.NODE_PROXY_PASSWORD}`).toString('base64')}`
-        }
-      })
-      const response = await res.json()
-
-      if (res.status === 200) {
-        const status = response[0]?.stats?.filter(
-          (stat) => stat.name === 'http_backend')[0]?.stats?.status
-        this.logger.debug(`Proxy status: ${status}`)
-        return status
-      } else {
-        this.logger.debug(`Proxy request status code: ${res.status}`)
-        return null
-      }
-    } catch (e) {
-      this.logger.error(`Error in fetching proxy status: ${e.message}`, e)
-    }
-  }
-
   async bumpHederaConfigVersion (configTxtPath) {
     const lines = (await readFile(configTxtPath, 'utf-8')).split('\n')
 

src/core/k8.mjs

@@ -767,31 +767,6 @@ export class K8 {
     }
   }
 
-  async recyclePodByLabels (podLabels, maxAttempts = 30, delay = 2000, waitForPodMaxAttempts = 10, waitForPodDelay = 2000) {
-    const podArray = await this.getPodsByLabel(podLabels)
-    for (const pod of podArray) {
-      const podName = pod.metadata.name
-      await this.kubeClient.deleteNamespacedPod(podName, this.configManager.getFlag(flags.namespace))
-    }
-
-    let attempts = 0
-    while (attempts++ < maxAttempts) {
-      try {
-        const pods = await this.waitForPods([constants.POD_PHASE_RUNNING],
-          podLabels, 1, waitForPodMaxAttempts, waitForPodDelay)
-        if (pods.length === podArray.length) {
-          return pods
-        }
-      } catch (e) {
-        this.logger.warn(`deleted pod still not running [${podLabels.join(',')}, attempt: ${attempts}/${maxAttempts}]`)
-      }
-
-      await sleep(delay)
-    }
-
-    throw new FullstackTestingError(`pods are not running after deletion with labels [${podLabels.join(',')}]`)
-  }
-
   /**
    * Wait for pod
    * @param phases an array of acceptable phases of the pods

test/e2e/commands/account.test.mjs

@@ -18,7 +18,8 @@
 
 import { AccountId, PrivateKey } from '@hashgraph/sdk'
 import {
-  afterAll, beforeAll,
+  afterAll,
+  beforeAll,
   describe,
   expect,
   it
@@ -30,6 +31,7 @@ import * as version from '../../../version.mjs'
 import {
   bootstrapNetwork,
   getDefaultArgv,
+  HEDERA_PLATFORM_VERSION_TAG,
   TEST_CLUSTER,
   testLogger
 } from '../../test_util.js'
@@ -43,7 +45,7 @@ describe('AccountCommand', () => {
   const testSystemAccounts = [[3, 5]]
   const argv = getDefaultArgv()
   argv[flags.namespace.name] = namespace
-  argv[flags.releaseTag.name] = 'v0.47.0-alpha.0'
+  argv[flags.releaseTag.name] = HEDERA_PLATFORM_VERSION_TAG
   argv[flags.keyFormat.name] = constants.KEY_FORMAT_PEM
   argv[flags.nodeIDs.name] = 'node0'
   argv[flags.generateGossipKeys.name] = true

test/e2e/commands/cluster.test.mjs

@@ -20,11 +20,13 @@ import {
   beforeEach,
   describe,
   expect,
-  it, jest
+  it,
+  jest
 } from '@jest/globals'
 import {
   bootstrapTestVariables,
   getDefaultArgv,
+  HEDERA_PLATFORM_VERSION_TAG,
   TEST_CLUSTER
 } from '../../test_util.js'
 import {
@@ -44,7 +46,7 @@ describe('ClusterCommand', () => {
   const namespace = testName
   const argv = getDefaultArgv()
   argv[flags.namespace.name] = namespace
-  argv[flags.releaseTag.name] = 'v0.47.0-alpha.0'
+  argv[flags.releaseTag.name] = HEDERA_PLATFORM_VERSION_TAG
   argv[flags.keyFormat.name] = constants.KEY_FORMAT_PEM
   argv[flags.nodeIDs.name] = 'node0'
   argv[flags.generateGossipKeys.name] = true

test/e2e/commands/mirror_node.test.mjs

@@ -17,7 +17,10 @@
  */
 
 import {
-  afterAll, afterEach, beforeAll, describe,
+  afterAll,
+  afterEach,
+  beforeAll,
+  describe,
   expect,
   it
 } from '@jest/globals'
@@ -28,6 +31,7 @@ import {
 import {
   bootstrapNetwork,
   getDefaultArgv,
+  HEDERA_PLATFORM_VERSION_TAG,
   TEST_CLUSTER
 } from '../../test_util.js'
 import * as version from '../../../version.mjs'
@@ -42,7 +46,7 @@ describe('MirrorNodeCommand', () => {
   const namespace = testName
   const argv = getDefaultArgv()
   argv[flags.namespace.name] = namespace
-  argv[flags.releaseTag.name] = 'v0.47.0-alpha.0'
+  argv[flags.releaseTag.name] = HEDERA_PLATFORM_VERSION_TAG
   argv[flags.keyFormat.name] = constants.KEY_FORMAT_PEM
 
   argv[flags.nodeIDs.name] = 'node0' // use a single node to reduce resource during e2e tests

test/e2e/commands/network.test.mjs

@@ -17,14 +17,16 @@
  */
 
 import {
-  afterAll, beforeAll,
+  afterAll,
+  beforeAll,
   describe,
   expect,
   it
 } from '@jest/globals'
 import {
   bootstrapTestVariables,
-  getDefaultArgv
+  getDefaultArgv,
+  HEDERA_PLATFORM_VERSION_TAG
 } from '../../test_util.js'
 import {
   constants
@@ -38,7 +40,7 @@ describe('NetworkCommand', () => {
   const namespace = testName
   const argv = getDefaultArgv()
   argv[flags.namespace.name] = namespace
-  argv[flags.releaseTag.name] = 'v0.47.0-alpha.0'
+  argv[flags.releaseTag.name] = HEDERA_PLATFORM_VERSION_TAG
   argv[flags.keyFormat.name] = constants.KEY_FORMAT_PEM
   argv[flags.nodeIDs.name] = 'node0'
   argv[flags.generateGossipKeys.name] = true

test/e2e/commands/relay.test.mjs

@@ -16,7 +16,9 @@
  */
 
 import {
-  afterAll, afterEach, describe,
+  afterAll,
+  afterEach,
+  describe,
   expect,
   it
 } from '@jest/globals'
@@ -27,6 +29,7 @@ import {
 import {
   bootstrapNetwork,
   getDefaultArgv,
+  HEDERA_PLATFORM_VERSION_TAG,
   TEST_CLUSTER
 } from '../../test_util.js'
 import * as version from '../../../version.mjs'
@@ -38,7 +41,7 @@ describe('RelayCommand', () => {
   const namespace = testName
   const argv = getDefaultArgv()
   argv[flags.namespace.name] = namespace
-  argv[flags.releaseTag.name] = 'v0.47.0-alpha.0'
+  argv[flags.releaseTag.name] = HEDERA_PLATFORM_VERSION_TAG
   argv[flags.keyFormat.name] = constants.KEY_FORMAT_PEM
 
   argv[flags.nodeIDs.name] = 'node0,node1'

test/e2e/core/k8_e2e.test.mjs

@@ -176,11 +176,4 @@ describe('K8', () => {
     const pvcs = await k8.listPvcsByNamespace(k8._getNamespace())
     expect(pvcs.length).toBeGreaterThan(0)
   }, defaultTimeout)
-
-  it('should be able to recycle pod by labels', async () => {
-    const podLabels = ['app=haproxy-node0', 'fullstack.hedera.com/type=haproxy']
-    const podArray1 = await k8.getPodsByLabel(podLabels)
-    const podsArray2 = await k8.recyclePodByLabels(podLabels)
-    expect(podsArray2.length >= podArray1.length).toBeTruthy()
-  }, 120000)
 })

test/e2e/e2e_node_util.js

@@ -38,15 +38,17 @@ import {
 import {
   bootstrapNetwork,
   getDefaultArgv,
-  getTestConfigManager, getTmpDir,
+  getTestConfigManager,
+  getTmpDir,
+  HEDERA_PLATFORM_VERSION_TAG,
   TEST_CLUSTER
 } from '../test_util.js'
 import { sleep } from '../../src/core/helpers.mjs'
 import path from 'path'
 import fs from 'fs'
 import crypto from 'crypto'
 
-export function e2eNodeKeyRefreshAddTest (keyFormat, testName, mode, releaseTag = 'v0.49.0-alpha.2') {
+export function e2eNodeKeyRefreshAddTest (keyFormat, testName, mode, releaseTag = HEDERA_PLATFORM_VERSION_TAG) {
   const defaultTimeout = 20000
 
   describe(`NodeCommand [testName ${testName}, mode ${mode}, keyFormat: ${keyFormat}, release ${releaseTag}]`, () => {

test/test_util.js

@@ -45,6 +45,7 @@ import {
 
 export const testLogger = logging.NewLogger('debug', true)
 export const TEST_CLUSTER = 'solo-e2e'
+export const HEDERA_PLATFORM_VERSION_TAG = 'v0.49.0-alpha.2'
 
 export function getTestCacheDir (testName) {
   const baseDir = 'test/data/tmp'