added dns templating for fully qualified domain name

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

Author: jeromy-cannon

src/commands/base.ts

@@ -24,6 +24,8 @@ import {Task} from '../core/task.js';
 import {ConsensusNode} from '../core/model/consensus_node.js';
 import {type ClusterRef, type ClusterRefs} from '../core/config/remote/types.js';
 import {Flags} from './flags.js';
+import {type Cluster} from '../core/config/remote/cluster.js';
+import {Templates} from '../core/templates.js';
 
 export interface CommandHandlers {
   parent: BaseCommand;
@@ -338,6 +340,7 @@ export abstract class BaseCommand extends ShellRunner {
    */
   public getConsensusNodes(): ConsensusNode[] {
     const consensusNodes: ConsensusNode[] = [];
+    const clusters: Record<ClusterRef, Cluster> = this.getRemoteConfigManager().clusters;
 
     // using the remoteConfigManager to get the consensus nodes
     if (this.getRemoteConfigManager()?.components?.consensusNodes) {
@@ -350,6 +353,16 @@ export abstract class BaseCommand extends ShellRunner {
             node.cluster,
             // use local config to get the context
             this.getLocalConfig().clusterRefs[node.cluster],
+            clusters[node.cluster].dnsBaseDomain,
+            clusters[node.cluster].dnsConsensusNodePattern,
+            Templates.renderConsensusNodeFullyQualifiedDomainName(
+              node.name,
+              node.nodeId,
+              node.namespace,
+              node.cluster,
+              clusters[node.cluster].dnsBaseDomain,
+              clusters[node.cluster].dnsConsensusNodePattern,
+            ),
           ),
         );
       });

src/commands/network.ts

@@ -293,13 +293,14 @@ export class NetworkCommand extends BaseCommand {
     googleCredential: string;
     loadBalancerEnabled: boolean;
     clusterRefs: ClusterRefs;
+    consensusNodes: ConsensusNode[];
   }): Promise<Record<ClusterRef, string>> {
     const valuesArg = this.prepareValuesArg(config);
 
     // prepare values files for each cluster
     const valuesArgMap: Record<ClusterRef, string> = {};
     const profileName = this.configManager.getFlag<string>(flags.profileName) as string;
-    this.profileValuesFile = await this.profileManager.prepareValuesForSoloChart(profileName);
+    this.profileValuesFile = await this.profileManager.prepareValuesForSoloChart(profileName, config.consensusNodes);
     const valuesFiles: Record<ClusterRef, string> = BaseCommand.prepareValuesFilesMap(
       config.clusterRefs,
       config.chartDirectory,

src/commands/node/configs.ts

@@ -18,6 +18,7 @@ import {type NodeAddConfigClass} from './node_add_config.js';
 import {type NamespaceName} from '../../core/kube/resources/namespace/namespace_name.js';
 import {type PodRef} from '../../core/kube/resources/pod/pod_ref.js';
 import {type K8Factory} from '../../core/kube/k8_factory.js';
+import {type ConsensusNode} from '../../core/model/consensus_node.js';
 
 export const PREPARE_UPGRADE_CONFIGS_NAME = 'prepareUpgradeConfig';
 export const DOWNLOAD_GENERATED_FILES_CONFIGS_NAME = 'downloadGeneratedFilesConfig';
@@ -56,6 +57,8 @@ export const prepareUpgradeConfigBuilder = async function (argv, ctx, task) {
     'nodeClient',
     'freezeAdminPrivateKey',
     'namespace',
+    'consensusNodes',
+    'contexts',
   ]) as NodePrepareUpgradeConfigClass;
 
   config.namespace = await resolveNamespaceFromDeployment(this.parent.localConfig, this.configManager, task);
@@ -75,6 +78,8 @@ export const downloadGeneratedFilesConfigBuilder = async function (argv, ctx, ta
     'existingNodeAliases',
     'serviceMap',
     'namespace',
+    'consensusNodes',
+    'contexts',
   ]) as NodeDownloadGeneratedFilesConfigClass;
 
   config.namespace = await resolveNamespaceFromDeployment(this.parent.localConfig, this.configManager, task);
@@ -94,6 +99,8 @@ export const upgradeConfigBuilder = async function (argv, ctx, task, shouldLoadN
     'stagingDir',
     'stagingKeysDir',
     'namespace',
+    'consensusNodes',
+    'contexts',
   ]) as NodeUpgradeConfigClass;
 
   config.namespace = await resolveNamespaceFromDeployment(this.parent.localConfig, this.configManager, task);
@@ -133,6 +140,8 @@ export const updateConfigBuilder = async function (argv, ctx, task, shouldLoadNo
     'stagingKeysDir',
     'treasuryKey',
     'namespace',
+    'consensusNodes',
+    'contexts',
   ]) as NodeUpdateConfigClass;
 
   config.namespace = await resolveNamespaceFromDeployment(this.parent.localConfig, this.configManager, task);
@@ -178,6 +187,8 @@ export const deleteConfigBuilder = async function (argv, ctx, task, shouldLoadNo
     'stagingKeysDir',
     'treasuryKey',
     'namespace',
+    'consensusNodes',
+    'contexts',
   ]) as NodeDeleteConfigClass;
 
   config.curDate = new Date();
@@ -226,6 +237,7 @@ export const addConfigBuilder = async function (argv, ctx, task, shouldLoadNodeC
     'treasuryKey',
     'namespace',
     'consensusNodes',
+    'contexts',
   ]) as NodeAddConfigClass;
 
   ctx.adminKey = argv[flags.adminKey.name]
@@ -271,6 +283,8 @@ export const logsConfigBuilder = async function (argv, ctx, task) {
     nodeAliases: helpers.parseNodeAliases(this.configManager.getFlag(flags.nodeAliasesUnparsed)),
     nodeAliasesUnparsed: this.configManager.getFlag(flags.nodeAliasesUnparsed),
     deployment: this.configManager.getFlag(flags.deployment),
+    consensusNodes: this.parent.getConsensusNodes(),
+    contexts: this.parent.getContexts(),
   } as NodeLogsConfigClass;
   ctx.config = config;
   return config;
@@ -282,6 +296,8 @@ export const statesConfigBuilder = async function (argv, ctx, task) {
     nodeAliases: helpers.parseNodeAliases(this.configManager.getFlag(flags.nodeAliasesUnparsed)),
     nodeAliasesUnparsed: this.configManager.getFlag(flags.nodeAliasesUnparsed),
     deployment: this.configManager.getFlag(flags.deployment),
+    consensusNodes: this.parent.getConsensusNodes(),
+    contexts: this.parent.getContexts(),
   };
   ctx.config = config;
   return config;
@@ -292,6 +308,8 @@ export const refreshConfigBuilder = async function (argv, ctx, task) {
     'nodeAliases',
     'podRefs',
     'namespace',
+    'consensusNodes',
+    'contexts',
   ]) as NodeRefreshConfigClass;
 
   ctx.config.namespace = await resolveNamespaceFromDeployment(this.parent.localConfig, this.configManager, task);
@@ -307,6 +325,8 @@ export const keysConfigBuilder = function (argv, ctx, task) {
     'curDate',
     'keysDir',
     'nodeAliases',
+    'consensusNodes',
+    'contexts',
   ]) as NodeKeysConfigClass;
 
   config.curDate = new Date();
@@ -333,6 +353,8 @@ export const stopConfigBuilder = async function (argv, ctx, task) {
     nodeAliases: helpers.parseNodeAliases(this.configManager.getFlag(flags.nodeAliasesUnparsed)),
     nodeAliasesUnparsed: this.configManager.getFlag(flags.nodeAliasesUnparsed),
     deployment: this.configManager.getFlag(flags.deployment),
+    consensusNodes: this.parent.getConsensusNodes(),
+    contexts: this.parent.getContexts(),
   };
 
   if (!(await this.k8Factory.default().namespaces().has(ctx.config.namespace))) {
@@ -343,7 +365,12 @@ export const stopConfigBuilder = async function (argv, ctx, task) {
 };
 
 export const startConfigBuilder = async function (argv, ctx, task) {
-  const config = this.getConfig(START_CONFIGS_NAME, argv.flags, ['nodeAliases', 'namespace']) as NodeStartConfigClass;
+  const config = this.getConfig(START_CONFIGS_NAME, argv.flags, [
+    'nodeAliases',
+    'namespace',
+    'consensusNodes',
+    'contexts',
+  ]) as NodeStartConfigClass;
   config.namespace = await resolveNamespaceFromDeployment(this.parent.localConfig, this.configManager, task);
 
   if (!(await this.k8Factory.default().namespaces().has(config.namespace))) {
@@ -360,6 +387,8 @@ export const setupConfigBuilder = async function (argv, ctx, task) {
     'nodeAliases',
     'podRefs',
     'namespace',
+    'consensusNodes',
+    'contexts',
   ]) as NodeSetupConfigClass;
 
   config.namespace = await resolveNamespaceFromDeployment(this.parent.localConfig, this.configManager, task);
@@ -377,6 +406,8 @@ export interface NodeLogsConfigClass {
   namespace: NamespaceName;
   deployment: string;
   nodeAliases: string[];
+  consensusNodes: ConsensusNode[];
+  contexts: string[];
 }
 
 export interface NodeRefreshConfigClass {
@@ -391,6 +422,8 @@ export interface NodeRefreshConfigClass {
   nodeAliases: NodeAliases;
   podRefs: Record<NodeAlias, PodRef>;
   getUnusedConfigs: () => string[];
+  consensusNodes: ConsensusNode[];
+  contexts: string[];
 }
 
 export interface NodeKeysConfigClass {
@@ -403,6 +436,8 @@ export interface NodeKeysConfigClass {
   keysDir: string;
   nodeAliases: NodeAliases;
   getUnusedConfigs: () => string[];
+  consensusNodes: ConsensusNode[];
+  contexts: string[];
 }
 
 export interface NodeStartConfigClass {
@@ -415,6 +450,8 @@ export interface NodeStartConfigClass {
   stagingDir: string;
   podRefs: Record<NodeAlias, PodRef>;
   nodeAliasesUnparsed: string;
+  consensusNodes: ConsensusNode[];
+  contexts: string[];
 }
 
 export interface NodeDeleteConfigClass {
@@ -444,6 +481,8 @@ export interface NodeDeleteConfigClass {
   treasuryKey: PrivateKey;
   getUnusedConfigs: () => string[];
   curDate: Date;
+  consensusNodes: ConsensusNode[];
+  contexts: string[];
 }
 
 export interface NodeSetupConfigClass {
@@ -460,6 +499,8 @@ export interface NodeSetupConfigClass {
   nodeAliases: NodeAliases;
   podRefs: Record<NodeAlias, PodRef>;
   getUnusedConfigs: () => string[];
+  consensusNodes: ConsensusNode[];
+  contexts: string[];
 }
 
 export interface NodeUpgradeConfigClass {
@@ -488,6 +529,8 @@ export interface NodeUpgradeConfigClass {
   treasuryKey: PrivateKey;
   getUnusedConfigs: () => string[];
   curDate: Date;
+  consensusNodes: ConsensusNode[];
+  contexts: string[];
 }
 
 export interface NodeUpdateConfigClass {
@@ -525,6 +568,8 @@ export interface NodeUpdateConfigClass {
   treasuryKey: PrivateKey;
   getUnusedConfigs: () => string[];
   curDate: Date;
+  consensusNodes: ConsensusNode[];
+  contexts: string[];
 }
 
 interface NodePrepareUpgradeConfigClass {
@@ -535,6 +580,8 @@ interface NodePrepareUpgradeConfigClass {
   freezeAdminPrivateKey: string;
   nodeClient: any;
   getUnusedConfigs: () => string[];
+  consensusNodes: ConsensusNode[];
+  contexts: string[];
 }
 
 interface NodeDownloadGeneratedFilesConfigClass {
@@ -548,4 +595,6 @@ interface NodeDownloadGeneratedFilesConfigClass {
   existingNodeAliases: NodeAliases[];
   allNodeAliases: NodeAliases[];
   serviceMap: Map<string, NetworkNodeServices>;
+  consensusNodes: ConsensusNode[];
+  contexts: string[];
 }

src/commands/node/tasks.ts

@@ -68,6 +68,7 @@ import {ContainerRef} from '../../core/kube/resources/container/container_ref.js
 import {NetworkNodes} from '../../core/network_nodes.js';
 import {container} from 'tsyringe-neo';
 import * as helpers from '../../core/helpers.js';
+import {type ConsensusNode} from '../../core/model/consensus_node.js';
 
 export class NodeCommandTasks {
   private readonly accountManager: AccountManager;
@@ -108,6 +109,8 @@ export class NodeCommandTasks {
       throw new IllegalArgumentError('An instance of ProfileManager is required', opts.profileManager);
     if (!opts || !opts.certificateManager)
       throw new IllegalArgumentError('An instance of CertificateManager is required', opts.certificateManager);
+    if (!opts || !opts.parent)
+      throw new IllegalArgumentError('An instance of parents as BaseCommand is required', opts.parent);
 
     this.accountManager = opts.accountManager;
     this.configManager = opts.configManager;
@@ -120,6 +123,7 @@ export class NodeCommandTasks {
     this.chartManager = opts.chartManager;
     this.certificateManager = opts.certificateManager;
     this.prepareValuesFiles = opts.parent.prepareValuesFiles.bind(opts.parent);
+    this.parent = opts.parent;
   }
 
   private async _prepareUpgradeZip(stagingDir: string) {
@@ -947,7 +951,7 @@ export class NodeCommandTasks {
       if (isGenesis) {
         await this.generateGenesisNetworkJson(
           ctx.config.namespace,
-          ctx.config.nodeAliases,
+          ctx.config.consensusNodes,
           ctx.config.keysDir,
           ctx.config.stagingDir,
         );
@@ -985,21 +989,21 @@ export class NodeCommandTasks {
    * Generate genesis network json file
    * @private
    * @param namespace - namespace
-   * @param nodeAliases - node aliases
+   * @param consensusNodes - consensus nodes
    * @param keysDir - keys directory
    * @param stagingDir - staging directory
    */
   private async generateGenesisNetworkJson(
     namespace: NamespaceName,
-    nodeAliases: NodeAliases,
+    consensusNodes: ConsensusNode[],
     keysDir: string,
     stagingDir: string,
   ) {
     const networkNodeServiceMap = await this.accountManager.getNodeServiceMap(namespace);
 
     const adminPublicKeys = splitFlagInput(this.configManager.getFlag(flags.adminPublicKeys));
     const genesisNetworkData = await GenesisNetworkDataConstructor.initialize(
-      nodeAliases,
+      consensusNodes,
       this.keyManager,
       this.accountManager,
       keysDir,
@@ -1822,6 +1826,8 @@ export class NodeCommandTasks {
 
       const config = await configInit(argv, ctx, task, shouldLoadNodeClient);
       ctx.config = config;
+      config.consensusNodes = this.parent.getConsensusNodes();
+      config.contexts = this.parent.getContexts();
 
       for (const flag of allRequiredFlags) {
         if (typeof config[flag.constName] === 'undefined') {

src/core/config/remote/remote_config_manager.ts

@@ -67,6 +67,13 @@ export class RemoteConfigManager {
     return this.remoteConfig?.components?.clone();
   }
 
+  /**
+   * @returns the remote configuration data's clusters cloned
+   */
+  public get clusters(): Record<ClusterRef, Cluster> {
+    return Object.assign({}, this.remoteConfig?.clusters);
+  }
+
   /* ---------- Readers and Modifiers ---------- */
 
   /**