got further into node add

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

Author: jeromy-cannon

src/commands/base.ts

@@ -3,7 +3,6 @@
  */
 
 import paths from 'path';
-import path from 'path';
 import {MissingArgumentError, SoloError} from '../core/errors.js';
 import {ShellRunner} from '../core/shell_runner.js';
 import {type LeaseManager} from '../core/lease/lease_manager.js';
@@ -18,6 +17,7 @@ import {type Opts} from '../types/command_types.js';
 import {type CommandFlag} from '../types/flag_types.js';
 import {type Lease} from '../core/lease/lease.js';
 import {Listr} from 'listr2';
+import path from 'path';
 import * as constants from '../core/constants.js';
 import fs from 'fs';
 import {Task} from '../core/task.js';

src/commands/node/configs.ts

@@ -225,6 +225,7 @@ export const addConfigBuilder = async function (argv, ctx, task, shouldLoadNodeC
     'stagingKeysDir',
     'treasuryKey',
     'namespace',
+    'consensusNodes',
   ]) as NodeAddConfigClass;
 
   ctx.adminKey = argv[flags.adminKey.name]
@@ -259,6 +260,8 @@ export const addConfigBuilder = async function (argv, ctx, task, shouldLoadNodeC
 
   config.serviceMap = await this.accountManager.getNodeServiceMap(config.namespace);
 
+  config.consensusNodes = this.parent.getConsensusNodes();
+
   return config;
 };
 

src/commands/node/handlers.ts

@@ -143,7 +143,9 @@ export class NodeCommandHandlers implements CommandHandlers {
   addPrepareTasks(argv: any, lease: Lease) {
     return [
       this.tasks.initialize(argv, addConfigBuilder.bind(this), lease),
-      this.validateSingleNodeState({excludedStates: []}),
+      // TODO instead of validating the state we need to do a remote config add component, and we will need to manually
+      //  the nodeAlias based on the next available node ID + 1
+      // this.validateSingleNodeState({excludedStates: []}),
       this.tasks.checkPVCsEnabled(),
       this.tasks.identifyExistingNodes(),
       this.tasks.determineNewNodeAccountNumber(),

src/commands/node/node_add_config.ts

@@ -6,6 +6,7 @@ import {type PodRef} from '../../core/kube/resources/pod/pod_ref.js';
 import {type NetworkNodeServices} from '../../core/network_node_services.js';
 import {type PrivateKey} from '@hashgraph/sdk';
 import {type NamespaceName} from '../../core/kube/resources/namespace/namespace_name.js';
+import {type ConsensusNode} from '../../core/model/consensus_node.js';
 
 export interface NodeAddConfigClass {
   app: string;
@@ -46,4 +47,5 @@ export interface NodeAddConfigClass {
   haproxyIps: string;
   envoyIps: string;
   getUnusedConfigs: () => string[];
+  consensusNodes: ConsensusNode[];
 }

src/commands/node/tasks.ts

@@ -1488,7 +1488,7 @@ export class NodeCommandTasks {
     return new Task('Copy node keys to secrets', (ctx: any, task: ListrTaskWrapper<any, any, any>) => {
       const subTasks = this.platformInstaller.copyNodeKeys(
         ctx.config.stagingDir,
-        ctx.config.allNodeAliases,
+        ctx.config.consensusNodes,
         ctx.config.contexts,
       );
 

test/test_add.ts

@@ -33,7 +33,7 @@ export function testNodeAdd(
 ): void {
   const suffix = localBuildPath.substring(0, 5);
   const namespace = NamespaceName.of(`node-add${suffix}`);
-  const argv = getDefaultArgv();
+  const argv = getDefaultArgv(namespace);
   argv[flags.nodeAliasesUnparsed.name] = 'node1,node2';
   argv[flags.stakeAmounts.name] = '1500,1';
   argv[flags.generateGossipKeys.name] = true;

test/test_util.ts

@@ -80,7 +80,7 @@ export function getDefaultArgv(namespace?: NamespaceName) {
     argv[f.name] = f.definition.defaultValue;
   }
 
-  const currentDeployment = namespace;
+  const currentDeployment = namespace.name;
   const cacheDir = getTestCacheDir();
   argv.cacheDir = cacheDir;
   argv[flags.cacheDir.name] = cacheDir;
@@ -228,13 +228,14 @@ export function e2eTestSuite(
     nodeCmdArg,
     accountCmdArg,
   );
-  const namespace = bootstrapResp.namespace;
-  const initCmd = bootstrapResp.cmd.initCmd;
-  const k8Factory = bootstrapResp.opts.k8Factory;
-  const clusterCmd = bootstrapResp.cmd.clusterCmd;
-  const networkCmd = bootstrapResp.cmd.networkCmd;
-  const nodeCmd = bootstrapResp.cmd.nodeCmd;
-  const chartManager = bootstrapResp.opts.chartManager;
+  const namespace: NamespaceName = bootstrapResp.namespace;
+  const initCmd: InitCommand = bootstrapResp.cmd.initCmd;
+  const k8Factory: K8Factory = bootstrapResp.opts.k8Factory;
+  const clusterCmd: ClusterCommand = bootstrapResp.cmd.clusterCmd;
+  const networkCmd: NetworkCommand = bootstrapResp.cmd.networkCmd;
+  const nodeCmd: NodeCommand = bootstrapResp.cmd.nodeCmd;
+  const chartManager: ChartManager = bootstrapResp.opts.chartManager;
+  const deploymentCmd: DeploymentCommand = bootstrapResp.cmd.deploymentCmd;
 
   describe(`E2E Test Suite for '${testName}'`, function () {
     this.bail(true); // stop on first failure, nothing else will matter if network doesn't come up correctly
@@ -273,6 +274,10 @@ export function e2eTestSuite(
         }
       }).timeout(Duration.ofMinutes(2).toMillis());
 
+      it('should succeed with deployment create', async () => {
+        expect(await deploymentCmd.create(argv)).to.be.true;
+      });
+
       it('generate key files', async () => {
         expect(await nodeCmd.handlers.keys(argv)).to.be.true;
         expect(nodeCmd.getUnusedConfigs(NodeCommandConfigs.KEYS_CONFIGS_NAME)).to.deep.equal([