Skip to content

Commit 8765498

Browse files
JeffreyDallasJeffreyDallas
committed
fst to solo
Signed-off-by: Jeffrey Tang <[email protected]>
1 parent ede6277 commit 8765498

31 files changed

+88
-88
lines changed

Diff for: ‎.github/ISSUE_TEMPLATE/feature_enhancement.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ body:
2222
placeholder: |
2323
_A clear and concise description of what you want to happen._
2424
25-
Note: Feature enhancements to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Full Stack Testing (Solo) Suite aims to be vendor agnostic.
25+
Note: Feature enhancements to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Solo Testing (Solo) Suite aims to be vendor agnostic.
2626
validations:
2727
required: true
2828
- type: textarea

Diff for: ‎.github/ISSUE_TEMPLATE/feature_request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
placeholder: |
1313
_A clear and concise description of what you want to happen._
1414
15-
Note: Feature requests to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Full Stack Testing (Solo) Suite aims to be vendor agnostic.
15+
Note: Feature requests to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Solo Suite aims to be vendor agnostic.
1616
validations:
1717
required: true
1818
- type: textarea

Diff for: ‎examples/custom-network-config/Taskfile.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dotenv:
55
silent: false
66

77
env:
8-
FST_CHART_VERSION: v0.30.0
8+
SOLO_CHART_VERSION: v0.30.0
99
CONSENSUS_NODE_VERSION: v0.54.1
1010
SOLO_NAMESPACE: solo-{{ env "USER" | replace "." "-" | trunc 63 }}
1111
SOLO_CLUSTER_SETUP_NAMESPACE: solo-setup
@@ -104,7 +104,7 @@ tasks:
104104
solo:network:deploy:
105105
internal: true
106106
cmds:
107-
- solo network deploy --release-tag "${CONSENSUS_NODE_VERSION}" --solo-chart-version "${FST_CHART_VERSION}" --values-file {{ .solo_values_file }} --settings-txt {{ .solo_settings_file }}
107+
- solo network deploy --release-tag "${CONSENSUS_NODE_VERSION}" --solo-chart-version "${SOLO_CHART_VERSION}" --values-file {{ .solo_values_file }} --settings-txt {{ .solo_settings_file }}
108108
- solo node setup --release-tag "${CONSENSUS_NODE_VERSION}"
109109

110110
solo:network:destroy:

Diff for: ‎src/commands/cluster.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class ClusterCommand extends BaseCommand {
9292
deployCertManagerCrds: self.configManager.getFlag(flags.deployCertManagerCrds),
9393
deployMinio: self.configManager.getFlag(flags.deployMinio),
9494
deployPrometheusStack: self.configManager.getFlag(flags.deployPrometheusStack),
95-
fstChartVersion: self.configManager.getFlag(flags.fstChartVersion)
95+
soloChartVersion: self.configManager.getFlag(flags.soloChartVersion)
9696
}
9797

9898
self.logger.debug('Prepare ctx.config', { config: ctx.config, argv })
@@ -118,7 +118,7 @@ export class ClusterCommand extends BaseCommand {
118118
title: `Install '${constants.SOLO_CLUSTER_SETUP_CHART}' chart`,
119119
task: async (ctx, _) => {
120120
const clusterSetupNamespace = ctx.config.clusterSetupNamespace
121-
const version = ctx.config.fstChartVersion
121+
const version = ctx.config.soloChartVersion
122122

123123
const chartPath = ctx.chartPath
124124
const valuesArg = ctx.valuesArg
@@ -276,7 +276,7 @@ export class ClusterCommand extends BaseCommand {
276276
flags.deployCertManagerCrds,
277277
flags.deployMinio,
278278
flags.deployPrometheusStack,
279-
flags.fstChartVersion
279+
flags.soloChartVersion
280280
),
281281
handler: argv => {
282282
clusterCmd.logger.debug("==== Running 'cluster setup' ===", { argv })

Diff for: ‎src/commands/flags.mjs

+4-4
Original file line numberDiff line numberDiff line change
@@ -418,12 +418,12 @@ export const deleteSecrets = {
418418
}
419419

420420
/** @type {CommandFlag} **/
421-
export const fstChartVersion = {
422-
constName: 'fstChartVersion',
421+
export const soloChartVersion = {
422+
constName: 'soloChartVersion',
423423
name: 'solo-chart-version',
424424
definition: {
425425
describe: 'Solo testing chart version',
426-
defaultValue: version.FST_CHART_VERSION,
426+
defaultValue: version.SOLO_CHART_VERSION,
427427
type: 'string'
428428
}
429429
}
@@ -807,7 +807,7 @@ export const allFlags = [
807807
enableHederaExplorerTls,
808808
enablePrometheusSvcMonitor,
809809
endpointType,
810-
fstChartVersion,
810+
soloChartVersion,
811811
generateGossipKeys,
812812
generateTlsKeys,
813813
gossipEndpoints,

Diff for: ‎src/commands/init.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export class InitCommand extends BaseCommand {
160160
flags.cacheDir,
161161
flags.chartDirectory,
162162
flags.clusterSetupNamespace,
163-
flags.fstChartVersion,
163+
flags.soloChartVersion,
164164
flags.namespace,
165165
flags.nodeAliasesUnparsed,
166166
flags.profileFile,

Diff for: ‎src/commands/mirror_node.mjs

+7-7
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export class MirrorNodeCommand extends BaseCommand {
5353
flags.chartDirectory,
5454
flags.deployHederaExplorer,
5555
flags.enableHederaExplorerTls,
56-
flags.fstChartVersion,
56+
flags.soloChartVersion,
5757
flags.hederaExplorerTlsHostName,
5858
flags.hederaExplorerTlsLoadBalancerIp,
5959
flags.namespace,
@@ -151,7 +151,7 @@ export class MirrorNodeCommand extends BaseCommand {
151151
flags.chartDirectory,
152152
flags.deployHederaExplorer,
153153
flags.enableHederaExplorerTls,
154-
flags.fstChartVersion,
154+
flags.soloChartVersion,
155155
flags.hederaExplorerTlsHostName,
156156
flags.hederaExplorerTlsLoadBalancerIp,
157157
flags.tlsClusterIssuerType,
@@ -167,7 +167,7 @@ export class MirrorNodeCommand extends BaseCommand {
167167
* @property {string} chartDirectory
168168
* @property {boolean} deployHederaExplorer
169169
* @property {string} enableHederaExplorerTls
170-
* @property {string} fstChartVersion
170+
* @property {string} soloChartVersion
171171
* @property {string} hederaExplorerTlsHostName
172172
* @property {string} hederaExplorerTlsLoadBalancerIp
173173
* @property {string} namespace
@@ -221,7 +221,7 @@ export class MirrorNodeCommand extends BaseCommand {
221221
constants.SOLO_DEPLOYMENT_CHART,
222222
ctx.config.chartPath,
223223
ctx.config.valuesArg,
224-
ctx.config.fstChartVersion
224+
ctx.config.soloChartVersion
225225
)
226226
}
227227
}
@@ -385,7 +385,7 @@ export class MirrorNodeCommand extends BaseCommand {
385385

386386
ctx.config = {
387387
chartDirectory: self.configManager.getFlag(flags.chartDirectory),
388-
fstChartVersion: this.configManager.getFlag(flags.fstChartVersion),
388+
soloChartVersion: this.configManager.getFlag(flags.soloChartVersion),
389389
namespace: self.configManager.getFlag(flags.namespace)
390390
}
391391

@@ -409,7 +409,7 @@ export class MirrorNodeCommand extends BaseCommand {
409409
constants.SOLO_DEPLOYMENT_CHART,
410410
ctx.config.chartPath,
411411
ctx.config.valuesArg,
412-
ctx.config.fstChartVersion
412+
ctx.config.soloChartVersion
413413
)
414414
}
415415
},
@@ -483,7 +483,7 @@ export class MirrorNodeCommand extends BaseCommand {
483483
builder: y => flags.setCommandFlags(y,
484484
flags.chartDirectory,
485485
flags.force,
486-
flags.fstChartVersion,
486+
flags.soloChartVersion,
487487
flags.namespace
488488
),
489489
handler: argv => {

Diff for: ‎src/commands/network.mjs

+5-5
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export class NetworkCommand extends BaseCommand {
6969
flags.chainId,
7070
flags.chartDirectory,
7171
flags.enablePrometheusSvcMonitor,
72-
flags.fstChartVersion,
72+
flags.soloChartVersion,
7373
flags.debugNodeAlias,
7474
flags.log4j2Xml,
7575
flags.namespace,
@@ -106,7 +106,7 @@ export class NetworkCommand extends BaseCommand {
106106
}
107107

108108
const profileName = this.configManager.getFlag(flags.profileName)
109-
this.profileValuesFile = await this.profileManager.prepareValuesForFstChart(profileName)
109+
this.profileValuesFile = await this.profileManager.prepareValuesForSoloChart(profileName)
110110
if (this.profileValuesFile) {
111111
valuesArg += this.prepareValuesFiles(this.profileValuesFile)
112112
}
@@ -165,7 +165,7 @@ export class NetworkCommand extends BaseCommand {
165165
* @property {string} cacheDir
166166
* @property {string} chartDirectory
167167
* @property {boolean} enablePrometheusSvcMonitor
168-
* @property {string} fstChartVersion
168+
* @property {string} soloChartVersion
169169
* @property {string} namespace
170170
* @property {string} nodeAliasesUnparsed
171171
* @property {string} persistentVolumeClaims
@@ -306,7 +306,7 @@ export class NetworkCommand extends BaseCommand {
306306
config.namespace,
307307
constants.SOLO_DEPLOYMENT_CHART,
308308
config.chartPath,
309-
config.fstChartVersion,
309+
config.soloChartVersion,
310310
config.valuesArg)
311311
}
312312
},
@@ -522,7 +522,7 @@ export class NetworkCommand extends BaseCommand {
522522
constants.SOLO_DEPLOYMENT_CHART,
523523
config.chartPath,
524524
config.valuesArg,
525-
config.fstChartVersion
525+
config.soloChartVersion
526526
)
527527
}
528528
},

Diff for: ‎src/commands/node.mjs

+9-9
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ export class NodeCommand extends BaseCommand {
212212
flags.devMode,
213213
flags.debugNodeAlias,
214214
flags.endpointType,
215-
flags.fstChartVersion,
215+
flags.soloChartVersion,
216216
flags.generateGossipKeys,
217217
flags.generateTlsKeys,
218218
flags.gossipEndpoints,
@@ -331,7 +331,7 @@ export class NodeCommand extends BaseCommand {
331331
flags.devMode,
332332
flags.debugNodeAlias,
333333
flags.endpointType,
334-
flags.fstChartVersion,
334+
flags.soloChartVersion,
335335
flags.gossipEndpoints,
336336
flags.gossipPrivateKey,
337337
flags.gossipPublicKey,
@@ -790,7 +790,7 @@ export class NodeCommand extends BaseCommand {
790790
constants.SOLO_DEPLOYMENT_CHART,
791791
config.chartPath,
792792
valuesArg,
793-
config.fstChartVersion
793+
config.soloChartVersion
794794
)
795795
}
796796

@@ -1650,7 +1650,7 @@ export class NodeCommand extends BaseCommand {
16501650
flags.debugNodeAlias,
16511651
flags.endpointType,
16521652
flags.force,
1653-
flags.fstChartVersion,
1653+
flags.soloChartVersion,
16541654
flags.localBuildPath,
16551655
flags.gossipEndpoints,
16561656
flags.grpcEndpoints
@@ -1668,7 +1668,7 @@ export class NodeCommand extends BaseCommand {
16681668
* @property {boolean} devMode
16691669
* @property {string} debugNodeAlias
16701670
* @property {string} endpointType
1671-
* @property {string} fstChartVersion
1671+
* @property {string} soloChartVersion
16721672
* @property {boolean} generateGossipKeys
16731673
* @property {boolean} generateTlsKeys
16741674
* @property {string} gossipEndpoints
@@ -2653,7 +2653,7 @@ export class NodeCommand extends BaseCommand {
26532653
flags.debugNodeAlias,
26542654
flags.endpointType,
26552655
flags.force,
2656-
flags.fstChartVersion,
2656+
flags.soloChartVersion,
26572657
flags.gossipEndpoints,
26582658
flags.gossipPrivateKey,
26592659
flags.gossipPublicKey,
@@ -2676,7 +2676,7 @@ export class NodeCommand extends BaseCommand {
26762676
* @property {boolean} devMode
26772677
* @property {string} debugNodeAlias
26782678
* @property {string} endpointType
2679-
* @property {string} fstChartVersion
2679+
* @property {string} soloChartVersion
26802680
* @property {string} gossipEndpoints
26812681
* @property {string} gossipPrivateKey
26822682
* @property {string} gossipPublicKey
@@ -3059,7 +3059,7 @@ export class NodeCommand extends BaseCommand {
30593059
flags.debugNodeAlias,
30603060
flags.endpointType,
30613061
flags.force,
3062-
flags.fstChartVersion,
3062+
flags.soloChartVersion,
30633063
flags.localBuildPath
30643064
])
30653065

@@ -3074,7 +3074,7 @@ export class NodeCommand extends BaseCommand {
30743074
* @property {boolean} devMode
30753075
* @property {string} debugNodeAlias
30763076
* @property {string} endpointType
3077-
* @property {string} fstChartVersion
3077+
* @property {string} soloChartVersion
30783078
* @property {string} localBuildPath
30793079
* @property {string} namespace
30803080
* @property {NodeAlias} nodeAlias

Diff for: ‎src/commands/prompts.mjs

+4-4
Original file line numberDiff line numberDiff line change
@@ -341,12 +341,12 @@ export async function promptDeleteSecrets (task, input) {
341341
flags.deleteSecrets.name)
342342
}
343343

344-
export async function promptFstChartVersion (task, input) {
344+
export async function promptSoloChartVersion (task, input) {
345345
return await promptText(task, input,
346-
flags.fstChartVersion.definition.defaultValue,
346+
flags.soloChartVersion.definition.defaultValue,
347347
'Enter solo testing chart version: ',
348348
null,
349-
flags.fstChartVersion.name)
349+
flags.soloChartVersion.name)
350350
}
351351

352352
export async function promptUpdateAccountKeys (task, input) {
@@ -450,7 +450,7 @@ export function getPromptMap () {
450450
.set(flags.enableHederaExplorerTls.name, promptEnableHederaExplorerTls)
451451
.set(flags.enablePrometheusSvcMonitor.name, promptEnablePrometheusSvcMonitor)
452452
.set(flags.force.name, promptForce)
453-
.set(flags.fstChartVersion.name, promptFstChartVersion)
453+
.set(flags.soloChartVersion.name, promptSoloChartVersion)
454454
.set(flags.generateGossipKeys.name, promptGenerateGossipKeys)
455455
.set(flags.generateTlsKeys.name, promptGenerateTLSKeys)
456456
.set(flags.hederaExplorerTlsHostName.name, promptHederaExplorerTlsHostName)

Diff for: ‎src/core/helpers.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ export function packageVersion () {
109109
export function getRootImageRepository (releaseTag) {
110110
const releaseVersion = semver.parse(releaseTag, { includePrerelease: true })
111111
if (releaseVersion.minor < 46) {
112-
return 'hashgraph/solo-charts/ubi8-init-java17'
112+
return 'hashgraph/solo-containers/ubi8-init-java17'
113113
}
114114

115-
return 'hashgraph/solo-charts/ubi8-init-java21'
115+
return 'hashgraph/solo-containers/ubi8-init-java21'
116116
}
117117

118118
/**

Diff for: ‎src/core/profile_manager.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ export class ProfileManager {
297297
* @param {string} profileName resource profile name
298298
* @returns {Promise<string>} return the full path to the values file
299299
*/
300-
prepareValuesForFstChart (profileName) {
300+
prepareValuesForSoloChart (profileName) {
301301
if (!profileName) throw new MissingArgumentError('profileName is required')
302302
const profile = this.getProfile(profileName)
303303

Diff for: ‎test/e2e/commands/account.test.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ describe('AccountCommand', () => {
5151
argv[flags.generateGossipKeys.name] = true
5252
argv[flags.generateTlsKeys.name] = true
5353
argv[flags.clusterName.name] = TEST_CLUSTER
54-
argv[flags.fstChartVersion.name] = version.FST_CHART_VERSION
55-
// set the env variable SOLO_FST_CHARTS_DIR if developer wants to use local Solo charts
56-
argv[flags.chartDirectory.name] = process.env.SOLO_FST_CHARTS_DIR ? process.env.SOLO_FST_CHARTS_DIR : undefined
54+
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION
55+
// set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
56+
argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ? process.env.SOLO_CHARTS_DIR : undefined
5757
const bootstrapResp = bootstrapNetwork(testName, argv)
5858
const accountCmd = new AccountCommand(bootstrapResp.opts, testSystemAccounts)
5959
bootstrapResp.cmd.accountCmd = accountCmd

Diff for: ‎test/e2e/commands/cluster.test.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ describe('ClusterCommand', () => {
5151
argv[flags.generateGossipKeys.name] = true
5252
argv[flags.generateTlsKeys.name] = true
5353
argv[flags.clusterName.name] = TEST_CLUSTER
54-
argv[flags.fstChartVersion.name] = version.FST_CHART_VERSION
54+
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION
5555
argv[flags.force.name] = true
56-
// set the env variable SOLO_FST_CHARTS_DIR if developer wants to use local Solo charts
57-
argv[flags.chartDirectory.name] = process.env.SOLO_FST_CHARTS_DIR ? process.env.SOLO_FST_CHARTS_DIR : undefined
56+
// set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
57+
argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ? process.env.SOLO_CHARTS_DIR : undefined
5858

5959
const bootstrapResp = bootstrapTestVariables(testName, argv)
6060
const k8 = bootstrapResp.opts.k8

Diff for: ‎test/e2e/commands/mirror_node.test.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ describe('MirrorNodeCommand', () => {
5151
argv[flags.generateGossipKeys.name] = true
5252
argv[flags.generateTlsKeys.name] = true
5353
argv[flags.clusterName.name] = TEST_CLUSTER
54-
argv[flags.fstChartVersion.name] = version.FST_CHART_VERSION
54+
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION
5555
argv[flags.force.name] = true
5656
argv[flags.relayReleaseTag.name] = flags.relayReleaseTag.definition.defaultValue
57-
// set the env variable SOLO_FST_CHARTS_DIR if developer wants to use local Solo charts
58-
argv[flags.chartDirectory.name] = process.env.SOLO_FST_CHARTS_DIR ? process.env.SOLO_FST_CHARTS_DIR : undefined
57+
// set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
58+
argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ? process.env.SOLO_CHARTS_DIR : undefined
5959
argv[flags.quiet.name] = true
6060

6161
const bootstrapResp = bootstrapNetwork(testName, argv)

Diff for: ‎test/e2e/commands/network.test.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ describe('NetworkCommand', () => {
5252
argv[flags.generateGossipKeys.name] = true
5353
argv[flags.generateTlsKeys.name] = true
5454
argv[flags.deployMinio.name] = true
55-
argv[flags.fstChartVersion.name] = version.FST_CHART_VERSION
55+
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION
5656
argv[flags.force.name] = true
5757
argv[flags.applicationEnv.name] = applicationEnvFilePath
58-
// set the env variable SOLO_FST_CHARTS_DIR if developer wants to use local Solo charts
59-
argv[flags.chartDirectory.name] = process.env.SOLO_FST_CHARTS_DIR ? process.env.SOLO_FST_CHARTS_DIR : undefined
58+
// set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
59+
argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ? process.env.SOLO_CHARTS_DIR : undefined
6060
argv[flags.quiet.name] = true
6161

6262
const bootstrapResp = bootstrapTestVariables(testName, argv)

0 commit comments

Comments
 (0)