temp: cluster apply network

src/quorum/instance/infra/InfraRunner.interface.ts

@@ -32,6 +32,7 @@ export interface InfraRunner<T> {
 export interface KubernetesInfraRunner<T> {
   createDeploymentAndService(payload: K8SRunCommandType): Promise<T>
   createTemplate(payload: K8SRunCommandType): Promise<T>
+  wait(job: string, namespace: string): Promise<T>
   deleteDeploymentAndService(payload: K8SRunCommandType): Promise<T>
 }
 

src/quorum/instance/infra/kubernetes/charts/goquorum-node/values.yaml

@@ -114,7 +114,7 @@ node:
 image:
   goquorum:
     repository: quorumengineering/quorum
-    tag: 22.7.1
+    tag: 23.4.0
   tessera:
     repository: quorumengineering/tessera
     tag: 22.1.7

src/quorum/instance/infra/kubernetes/runner.ts

@@ -1,8 +1,6 @@
-import YAML from 'js-yaml'
 import { logger } from '../../../../util/logger'
 import { spawn } from 'child_process'
 import config from '../../../config'
-import fs from 'fs-extra'
 import { DockerResultType, KubernetesInfraRunner } from '../InfraRunner.interface'
 import { K8SRunCommandType } from '../../../model/type/kubernetes.type'
 
@@ -30,6 +28,12 @@ export class Runner implements KubernetesInfraRunner<DockerResultType> {
     return { stdout: '' }
   }
 
+  public wait = async (job: string, namespace: string): Promise<DockerResultType> => {
+    await console.log('wait')
+    await this.runKubectl(['wait', '--for=condition=complete', job, '-n', namespace, '--timeout=600s'])
+    return { stdout: '' }
+  }
+
   public deleteDeploymentAndService = async (payload: K8SRunCommandType): Promise<DockerResultType> => {
     await console.log('deleteDeploymentAndService')
     await this.runHelm(
@@ -57,15 +61,6 @@ export class Runner implements KubernetesInfraRunner<DockerResultType> {
     return { stdout: '' }
   }
 
-  private getYaml (path: string): Promise<any> {
-    return new Promise((resolve, reject) => {
-      fs.readFile(path, 'utf8', (err, data) => {
-        if (err) reject(err)
-        resolve(YAML.load(data))
-      })
-    })
-  }
-
   private async checkAndCreateNamespace (namespace: string): Promise<void> {
     try {
       console.log(`kubectl get namespaces ${namespace}`)

src/quorum/instance/kubernetesCluster.ts

@@ -18,4 +18,11 @@ export default class KubernetesInstance extends AbstractInstance {
       return await this.kubernetesInfra.createTemplate(payload)
     }
   }
+
+  public async wait (job: string, namespace: string) {
+    logger.debug('Kubernetes instance wait')
+    if (this.kubernetesInfra !== undefined) {
+      return await this.kubernetesInfra.wait(job, namespace)
+    }
+  }
 }

src/quorum/service/cluster.ts

@@ -24,6 +24,7 @@ export default class Cluster extends AbstractService {
       values: this.bdkFile.getGenesisChartPath(),
     })
 
+    await k8s.wait('job.batch/goquorum-genesis-init', 'quorum')
     // create network
     const validatorYaml = new ValidatorConfigYaml()
     validatorYaml.setCluster()
@@ -44,15 +45,15 @@ export default class Cluster extends AbstractService {
     for (let i = 0; i < validatorNumber; i += 1) {
       await k8s.install({
         helmChart: this.bdkFile.getGoQuorumNodeChartPath(),
-        name: `validator${i}`,
+        name: `validator-${i + 1}`,
         namespace: 'quorum',
         values: this.bdkFile.getValidatorChartPath(i),
       })
     }
     for (let i = 0; i < memberNumber; i += 1) {
       await k8s.install({
         helmChart: this.bdkFile.getGoQuorumNodeChartPath(),
-        name: `member${i}`,
+        name: `member-${i + 1}`,
         namespace: 'quorum',
         values: this.bdkFile.getMemberChartPath(i),
       })