Skip to content

Commit

Permalink
removed tlsClusterIssuerNamespace
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 17cc975 commit 2d8458c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 33 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 tlsClusterIssuerNamespace = { // delete
name: 'tls-cluster-issuer-namespace',
definition: { // TODO fix
describe: 'The namespace of the TLS cluster issuer to use for gateway services, defaults to "cert-manager"',
default: 'cert-manager',
type: 'string'
}
}

export const acmeClusterIssuer = { // delete
name: 'acme-cluster-issuer',
definition: {
Expand Down Expand Up @@ -305,7 +296,6 @@ export const allFlags = [
operatorId,
operatorKey,
tlsClusterIssuerName,
tlsClusterIssuerNamespace,
enableHederaExplorerTls,
deletePvcs
]
10 changes: 3 additions & 7 deletions fullstack-network-manager/src/commands/network.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { constants, Templates } from '../core/index.mjs'
import * as prompts from './prompts.mjs'

export class NetworkCommand extends BaseCommand {
getTlsValueArguments (tlsClusterIssuerName, tlsClusterIssuerNamespace, enableHederaExplorerTls) {
getTlsValueArguments (tlsClusterIssuerName, enableHederaExplorerTls) {
// TODO rebuild

// return valuesArg
Expand All @@ -29,7 +29,7 @@ export class NetworkCommand extends BaseCommand {
}

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

Expand All @@ -69,7 +68,6 @@ export class NetworkCommand extends BaseCommand {
deployMirrorNode: await prompts.promptDeployMirrorNode(task, deployMirrorNode),
deployHederaExplorer: await prompts.promptDeployHederaExplorer(task, deployExplorer),
tlsClusterIssuerName: await prompts.promptTlsClusterIssuerName(task, tlsClusterIssuerName),
tlsClusterIssuerNamespace: await prompts.promptTlsClusterIssuerNamespace(task, tlsClusterIssuerNamespace),
enableHederaExplorerTls: await prompts.promptEnableHederaExplorerTls(task, enableHederaExplorerTls),
acmeClusterIssuer: await prompts.promptAcmeClusterIssuer(task, acmeClusterIssuer),
version: this.configManager.getVersion()
Expand All @@ -81,7 +79,7 @@ export class NetworkCommand extends BaseCommand {

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

return config
Expand Down Expand Up @@ -294,7 +292,6 @@ export class NetworkCommand extends BaseCommand {
flags.valuesFile,
flags.chartDirectory,
flags.tlsClusterIssuerName,
flags.tlsClusterIssuerNamespace,
flags.enableHederaExplorerTls,
flags.acmeClusterIssuer
)
Expand Down Expand Up @@ -345,7 +342,6 @@ export class NetworkCommand extends BaseCommand {
flags.valuesFile,
flags.chartDirectory,
flags.tlsClusterIssuerName,
flags.tlsClusterIssuerNamespace,
flags.enableHederaExplorerTls,
flags.acmeClusterIssuer
),
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 @@ -367,22 +367,6 @@ export async function promptTlsClusterIssuerName (task, input) {
}
}

export async function promptTlsClusterIssuerNamespace (task, input) {
try {
if (!input) {
input = await task.prompt(ListrEnquirerPromptAdapter).run({
type: 'text',
default: flags.tlsClusterIssuerNamespace.definition.default,
message: 'Enter TLS cluster issuer namespace:'
})
}

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

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

0 comments on commit 2d8458c

Please sign in to comment.