Skip to content

Commit

Permalink
remove acmeClusterIssuer
Browse files Browse the repository at this point in the history
Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com>
  • Loading branch information
jeromy-cannon committed Jan 26, 2024
1 parent 2d8458c commit 55fb30e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 36 deletions.
10 changes: 0 additions & 10 deletions fullstack-network-manager/src/commands/flags.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -245,15 +245,6 @@ export const tlsClusterIssuerName = { // tlsClusterIssuerType
}
}

export const acmeClusterIssuer = { // delete
name: 'acme-cluster-issuer',
definition: {
describe: 'The acme let\'s encrypt cert-manager cluster issuer, defaults to false',
default: false,
type: 'boolean'
}
}

export const enableHederaExplorerTls = { // KEEP
name: 'enable-hedera-explorer-tls',
definition: {
Expand Down Expand Up @@ -285,7 +276,6 @@ export const allFlags = [
deployMinio,
deployCertManager,
deployCertManagerCrds,
acmeClusterIssuer,
releaseTag,
relayReleaseTag,
cacheDir,
Expand Down
14 changes: 4 additions & 10 deletions fullstack-network-manager/src/commands/network.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class NetworkCommand extends BaseCommand {
}

prepareValuesArg (chartDir, valuesFile, deployMirrorNode, deployHederaExplorer, tlsClusterIssuerName,
enableHederaExplorerTls, acmeClusterIssuer) {
enableHederaExplorerTls) {
let valuesArg = ''
if (chartDir) {
valuesArg = `-f ${chartDir}/fullstack-deployment/values.yaml`
Expand All @@ -38,7 +38,6 @@ export class NetworkCommand extends BaseCommand {
valuesArg += this.prepareValuesFiles(valuesFile)

valuesArg += ` --set hedera-mirror-node.enabled=${deployMirrorNode} --set hedera-explorer.enabled=${deployHederaExplorer}`
valuesArg += ` --set cloud.acmeClusterIssuer.enabled=${acmeClusterIssuer}`

// if (enableTls) {
// valuesArg += this.getTlsValueArguments(enableTls, tlsClusterIssuerName, tlsClusterIssuerNamespace, enableHederaExplorerTls)
Expand All @@ -57,7 +56,6 @@ export class NetworkCommand extends BaseCommand {
const deployExplorer = this.configManager.getFlag(flags.deployHederaExplorer)
const tlsClusterIssuerName = this.configManager.getFlag(flags.tlsClusterIssuerName)
const enableHederaExplorerTls = this.configManager.getFlag(flags.enableHederaExplorerTls)
const acmeClusterIssuer = this.configManager.getFlag(flags.acmeClusterIssuer)

// prompt if values are missing and create a config object
const config = {
Expand All @@ -69,7 +67,6 @@ export class NetworkCommand extends BaseCommand {
deployHederaExplorer: await prompts.promptDeployHederaExplorer(task, deployExplorer),
tlsClusterIssuerName: await prompts.promptTlsClusterIssuerName(task, tlsClusterIssuerName),
enableHederaExplorerTls: await prompts.promptEnableHederaExplorerTls(task, enableHederaExplorerTls),
acmeClusterIssuer: await prompts.promptAcmeClusterIssuer(task, acmeClusterIssuer),
version: this.configManager.getVersion()
}

Expand All @@ -79,8 +76,7 @@ export class NetworkCommand extends BaseCommand {

config.valuesArg = this.prepareValuesArg(config.chartDir,
config.valuesFile, config.deployMirrorNode, config.deployHederaExplorer,
config.tlsClusterIssuerName, config.enableHederaExplorerTls,
config.acmeClusterIssuer)
config.tlsClusterIssuerName, config.enableHederaExplorerTls)

return config
}
Expand Down Expand Up @@ -292,8 +288,7 @@ export class NetworkCommand extends BaseCommand {
flags.valuesFile,
flags.chartDirectory,
flags.tlsClusterIssuerName,
flags.enableHederaExplorerTls,
flags.acmeClusterIssuer
flags.enableHederaExplorerTls
)
},
handler: argv => {
Expand Down Expand Up @@ -342,8 +337,7 @@ export class NetworkCommand extends BaseCommand {
flags.valuesFile,
flags.chartDirectory,
flags.tlsClusterIssuerName,
flags.enableHederaExplorerTls,
flags.acmeClusterIssuer
flags.enableHederaExplorerTls
),
handler: argv => {
networkCmd.logger.debug("==== Running 'chart upgrade' ===")
Expand Down
16 changes: 0 additions & 16 deletions fullstack-network-manager/src/commands/prompts.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -303,22 +303,6 @@ export async function promptDeployCertManagerCrds (task, input) {
}
}

export async function promptAcmeClusterIssuer (task, input) {
try {
if (typeof input !== 'boolean') {
input = await task.prompt(ListrEnquirerPromptAdapter).run({
type: 'toggle',
default: flags.acmeClusterIssuer.definition.default,
message: 'Would you like to deploy ACME Cluster Issuer?'
})
}

return input
} catch (e) {
throw new FullstackTestingError(`input failed: ${flags.acmeClusterIssuer.name}`, e)
}
}

export async function promptDeployMirrorNode (task, input) {
try {
if (input === undefined) {
Expand Down

0 comments on commit 55fb30e

Please sign in to comment.