Skip to content

Commit b4632d2

Browse files
author
Trevor Porter
authored
Specify a context when deploying oracles, add 3rd mainnet cluster (#4299)
### Description This does away with the "primary" and "secondary" terminology when referring to an oracle cluster, and instead introduces "contexts" for oracle deployments. An oracle context can really have any value, but in practice it should be: `<cloud provider>-<region>`, eg `azure-westus2` or `azure-westeurope`. This is what should be passed into celotool, for example: ``` celotooljs deploy initial oracle -e oracledev --context azure-eastus ``` Behind the scenes, this context is coerced into being all caps and using underscores instead of dashes. Env variables for a an oracle context are expected to be present and have a prefix of the form `ORACLE_<context in caps and underscores>_.*` (eg `ORACLE_AZURE_EASTUS_AZURE_SUBSCRIPTION_ID`). To do this, `DynamicEnvVar`s are introduced, which are a way of dynamically generating an environment variable name. For example: ``` ORACLE_AZURE_SUBSCRIPTION_ID = 'ORACLE_{{ oracleContext }}_AZURE_SUBSCRIPTION_ID', ``` In this case, `{{ oracleContext }}` is replaced at runtime with the value of whatever the oracleContext is. This also moves oracle full node env vars to be context-specific, so that one context can have more/less full nodes or more/less storage per node. ### Other changes * Adds a 3rd cluster in Azure that has full nodes constantly running as an emergency backup. * Adds the ability to optionally specify which resource group a key vault is located in: `<address>:<key vault name>:<resource group (optional)>` ### Tested Deployed! ### Related issues n/a ### Backwards compatibility Env variables must be updated
1 parent cda7fe1 commit b4632d2

File tree

14 files changed

+347
-249
lines changed

14 files changed

+347
-249
lines changed

.env.baklava

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,25 @@ AZURE_TX_NODES_DISK_SIZE=30
4848
ORACLE_DOCKER_IMAGE_REPOSITORY="celoprod.azurecr.io/oracle/baklava"
4949
ORACLE_DOCKER_IMAGE_TAG="1296f8db449469c74d2eed532d5a06b3df68c596"
5050

51-
ORACLE_PRIMARY_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
52-
ORACLE_PRIMARY_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
53-
ORACLE_PRIMARY_AZURE_KUBERNETES_RESOURCE_GROUP=baklava-oracles-westus2
54-
ORACLE_PRIMARY_AZURE_KUBERNETES_CLUSTER_NAME=baklava-oracles-westus2
55-
ORACLE_PRIMARY_ADDRESS_AZURE_KEY_VAULTS=0xd71fea6b92d3f21f659152589223385a7329bb11:baklava-oracle,0x1e477fc9b6a49a561343cd16b2c541930f5da7d2:baklava-oracle1,0x460b3f8d3c203363bb65b1a18d89d4ffb6b0c981:baklava-oracle2,0x3b522230c454ca9720665d66e6335a72327291e8:baklava-oracle3,0x0AFe167600a5542d10912f4A07DFc4EEe0769672:baklava-oracle4
56-
57-
ORACLE_SECONDARY_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
58-
ORACLE_SECONDARY_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
59-
ORACLE_SECONDARY_AZURE_KUBERNETES_RESOURCE_GROUP=baklava-oracles-centralus
60-
ORACLE_SECONDARY_AZURE_KUBERNETES_CLUSTER_NAME=baklava-oracles-centralus
61-
ORACLE_SECONDARY_ADDRESS_AZURE_KEY_VAULTS=0x412ebe7859e9aa71ff5ce4038596f6878c359c96:baklava-oracle5,0xbbfe73df8b346b3261b19ac91235888aba36d68c:baklava-oracle6,0x02b1d1bea682fcab4448c0820f5db409cce4f702:baklava-oracle7,0xe90f891710f625f18ecbf1e02efb4fd1ab236a10:baklava-oracle8,0x28c52c722df87ed11c5d7665e585e84aa93d7964:baklava-oracle9
51+
# each context should have its own environment variables, generally of the form
52+
# ORACLE_<context in all caps and underscores>_*
53+
ORACLE_CONTEXTS=azure-westus2,azure-centralus
54+
55+
ORACLE_AZURE_WESTUS2_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
56+
ORACLE_AZURE_WESTUS2_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
57+
ORACLE_AZURE_WESTUS2_AZURE_KUBERNETES_RESOURCE_GROUP=baklava-oracles-westus2
58+
ORACLE_AZURE_WESTUS2_KUBERNETES_CLUSTER_NAME=baklava-oracles-westus2
59+
# Format should be a comma-separated sequence of:
60+
# <address>:<key vault name>:<resource group (optional)>
61+
ORACLE_AZURE_WESTUS2_ADDRESS_AZURE_KEY_VAULTS=0xd71fea6b92d3f21f659152589223385a7329bb11:baklava-oracle,0x1e477fc9b6a49a561343cd16b2c541930f5da7d2:baklava-oracle1,0x460b3f8d3c203363bb65b1a18d89d4ffb6b0c981:baklava-oracle2,0x3b522230c454ca9720665d66e6335a72327291e8:baklava-oracle3,0x0AFe167600a5542d10912f4A07DFc4EEe0769672:baklava-oracle4
62+
63+
ORACLE_AZURE_CENTRALUS_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
64+
ORACLE_AZURE_CENTRALUS_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
65+
ORACLE_AZURE_CENTRALUS_AZURE_KUBERNETES_RESOURCE_GROUP=baklava-oracles-centralus
66+
ORACLE_AZURE_CENTRALUS_KUBERNETES_CLUSTER_NAME=baklava-oracles-centralus
67+
# Format should be a comma-separated sequence of:
68+
# <address>:<key vault name>:<resource group (optional)>
69+
ORACLE_AZURE_CENTRALUS_ADDRESS_AZURE_KEY_VAULTS=0x412ebe7859e9aa71ff5ce4038596f6878c359c96:baklava-oracle5,0xbbfe73df8b346b3261b19ac91235888aba36d68c:baklava-oracle6,0x02b1d1bea682fcab4448c0820f5db409cce4f702:baklava-oracle7,0xe90f891710f625f18ecbf1e02efb4fd1ab236a10:baklava-oracle8,0x28c52c722df87ed11c5d7665e585e84aa93d7964:baklava-oracle9
6270

6371
TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
6472
TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-dc5e5dfa07231a4ff4664816a95eae606293eae9"

.env.oracledev

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,18 @@ ORACLE_DOCKER_IMAGE_TAG="c7215fcbeccc0c61b306fbd0503a67bd0cf509de"
66

77
ORACLE_UNUSED_ORACLE_ADDRESSES=
88

9-
ORACLE_PRIMARY_AZURE_SUBSCRIPTION_ID=97e2b592-255b-4f92-bce0-127257163c36
10-
ORACLE_PRIMARY_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
11-
ORACLE_PRIMARY_AZURE_KUBERNETES_CLUSTER_NAME=testnet-oracle-eastus
12-
ORACLE_PRIMARY_AZURE_KUBERNETES_RESOURCE_GROUP=testnet-oracle-eastus
13-
ORACLE_PRIMARY_ADDRESS_AZURE_KEY_VAULTS=0x21860ca3a0a6f7e450b8f24bd00eac7ba766b85e:testnet-oracle-eastus,0xfd3738e5e0a020614a9e5253078dda491e77031c:testnet-oracle-eastus
14-
# ORACLE_PRIMARY_ADDRESSES_FROM_MNEMONIC_COUNT=
15-
16-
# Secondary cluster is not used
17-
18-
# ORACLE_SECONDARY_AZURE_SUBSCRIPTION_ID=
19-
# ORACLE_SECONDARY_AZURE_TENANT_ID=
20-
# ORACLE_SECONDARY_AZURE_KUBERNETES_CLUSTER_NAME=
21-
# ORACLE_SECONDARY_AZURE_KUBERNETES_RESOURCE_GROUP=
22-
# ORACLE_SECONDARY_ADDRESS_AZURE_KEY_VAULTS=
23-
# ORACLE_SECONDARY_ADDRESSES_FROM_MNEMONIC_COUNT=
9+
# each context should have its own environment variables, generally of the form
10+
# ORACLE_<context in all caps and underscores>_*
11+
ORACLE_CONTEXTS=azure-eastus
12+
13+
ORACLE_AZURE_EASTUS_AZURE_SUBSCRIPTION_ID=97e2b592-255b-4f92-bce0-127257163c36
14+
ORACLE_AZURE_EASTUS_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
15+
ORACLE_AZURE_EASTUS_AZURE_KUBERNETES_RESOURCE_GROUP=testnet-oracle-eastus
16+
ORACLE_AZURE_EASTUS_KUBERNETES_CLUSTER_NAME=testnet-oracle-eastus
17+
# Format should be a comma-separated sequence of:
18+
# <address>:<key vault name>:<resource group (optional)>
19+
ORACLE_AZURE_EASTUS_ADDRESS_AZURE_KEY_VAULTS=0x21860ca3a0a6f7e450b8f24bd00eac7ba766b85e:testnet-oracle-eastus,0xfd3738e5e0a020614a9e5253078dda491e77031c:testnet-oracle-eastus
20+
# ORACLE_AZURE_EASTUS_ADDRESSES_FROM_MNEMONIC_COUNT=
2421

2522
# ---- General ----
2623

.env.rc1

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,40 @@ ORACLE_DOCKER_IMAGE_TAG="a735bc993d475a5b3fb9e7f85117549c116a8ae9"
5454

5555
ORACLE_UNUSED_ORACLE_ADDRESSES=0xB93Fe7906ea4221b3fbe23412D18Ab1B07FE2F71,0x8d25D74E43789079Ef3C6B965c3D22b63A1233aC,0xCD88Cc79342a7cFE78E91FAa173eC87704bDcA9a,0x5091110175318A2A8aF88309D1648c1D84d31B29,0xBBd6e54Af7A5722f42461C6313F37Bd50729F195,0xE23a4c6615669526Ab58E9c37088bee4eD2b2dEE
5656

57-
ORACLE_PRIMARY_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
58-
ORACLE_PRIMARY_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
59-
ORACLE_PRIMARY_AZURE_KUBERNETES_RESOURCE_GROUP=mainnet-oracles-westus2
60-
ORACLE_PRIMARY_AZURE_KUBERNETES_CLUSTER_NAME=mainnet-oracles-westus2v1
61-
ORACLE_PRIMARY_ADDRESS_AZURE_KEY_VAULTS=0x0aee051be85ba9c7c1bc635fb76b52039341ab26:mainnet-oracle0,0xd3405621f6cdcd95519a79d37f91c78e7c79cefa:mainnet-oracle1,0xe037f31121f3a96c0cc49d0cf55b2f5d6deff19e:mainnet-oracle2,0x12bad172b47287a754048f0d294221a499d1690f:mainnet-oracle3,0xacad5b2913e21ccc073b80e431fec651cd8231c6:mainnet-oracle4
62-
63-
ORACLE_SECONDARY_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
64-
ORACLE_SECONDARY_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
65-
ORACLE_SECONDARY_AZURE_KUBERNETES_RESOURCE_GROUP=mainnet-oracles-westeurope
66-
ORACLE_SECONDARY_AZURE_KUBERNETES_CLUSTER_NAME=mainnet-oracles-westeurope
67-
ORACLE_SECONDARY_ADDRESS_AZURE_KEY_VAULTS=0xfe9925e6ae9c4cd50ae471b90766aaef37ad307e:mainnet-oracle-eu0,0x641c6466dae2c0b1f1f4f9c547bc3f54f4744a1d:mainnet-oracle-eu1,0x75becd8e400552bac29cbe0534d8c7d6cba49979:mainnet-oracle-eu2,0x223ab67272891dd352194be61597042ecf9c272a:mainnet-oracle-eu3,0xca9ae47493f763a7166ab8310686b197984964b4:mainnet-oracle-eu4
68-
69-
AZURE_TX_NODES_COUNT=5
70-
AZURE_TX_NODES_DISK_SIZE=100
57+
# each context should have its own environment variables, generally of the form
58+
# ORACLE_<context in all caps and underscores>_*
59+
ORACLE_CONTEXTS=azure-westus2,azure-westeurope,azure-eastus2
60+
61+
ORACLE_AZURE_WESTUS_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
62+
ORACLE_AZURE_WESTUS_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
63+
ORACLE_AZURE_WESTUS_AZURE_KUBERNETES_RESOURCE_GROUP=mainnet-oracles-westus2
64+
ORACLE_AZURE_WESTUS_KUBERNETES_CLUSTER_NAME=mainnet-oracles-westus2v1
65+
# Format should be a comma-separated sequence of:
66+
# <address>:<key vault name>:<resource group (optional)>
67+
ORACLE_AZURE_WESTUS_ADDRESS_AZURE_KEY_VAULTS=0x0aee051be85ba9c7c1bc635fb76b52039341ab26:mainnet-oracle0,0xd3405621f6cdcd95519a79d37f91c78e7c79cefa:mainnet-oracle1,0xe037f31121f3a96c0cc49d0cf55b2f5d6deff19e:mainnet-oracle2,0x12bad172b47287a754048f0d294221a499d1690f:mainnet-oracle3,0xacad5b2913e21ccc073b80e431fec651cd8231c6:mainnet-oracle4
68+
ORACLE_AZURE_WESTUS_TX_NODES_COUNT=5
69+
ORACLE_AZURE_WESTUS_TX_NODES_DISK_SIZE=100
70+
71+
ORACLE_AZURE_WESTEUROPE_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
72+
ORACLE_AZURE_WESTEUROPE_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
73+
ORACLE_AZURE_WESTEUROPE_AZURE_KUBERNETES_RESOURCE_GROUP=mainnet-oracles-westeurope
74+
ORACLE_AZURE_WESTEUROPE_KUBERNETES_CLUSTER_NAME=mainnet-oracles-westeurope
75+
# Format should be a comma-separated sequence of:
76+
# <address>:<key vault name>:<resource group (optional)>
77+
ORACLE_AZURE_WESTEUROPE_ADDRESS_AZURE_KEY_VAULTS=0xfe9925e6ae9c4cd50ae471b90766aaef37ad307e:mainnet-oracle-eu0,0x641c6466dae2c0b1f1f4f9c547bc3f54f4744a1d:mainnet-oracle-eu1,0x75becd8e400552bac29cbe0534d8c7d6cba49979:mainnet-oracle-eu2,0x223ab67272891dd352194be61597042ecf9c272a:mainnet-oracle-eu3,0xca9ae47493f763a7166ab8310686b197984964b4:mainnet-oracle-eu4
78+
ORACLE_AZURE_WESTEUROPE_TX_NODES_COUNT=5
79+
ORACLE_AZURE_WESTEUROPE_TX_NODES_DISK_SIZE=100
80+
81+
ORACLE_AZURE_EASTUS2_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
82+
ORACLE_AZURE_EASTUS2_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
83+
ORACLE_AZURE_EASTUS2_AZURE_KUBERNETES_RESOURCE_GROUP=mainnet-oracles-eastus2
84+
ORACLE_AZURE_EASTUS2_KUBERNETES_CLUSTER_NAME=mainnet-oracles-eastus2
85+
# Format should be a comma-separated sequence of:
86+
# <address>:<key vault name>:<resource group (optional)>
87+
# Set these when needed
88+
ORACLE_AZURE_EASTUS2_AZURE_KEY_VAULTS=
89+
ORACLE_AZURE_EASTUS2_TX_NODES_COUNT=3
90+
ORACLE_AZURE_EASTUS2_TX_NODES_DISK_SIZE=100
7191

7292
TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
7393
TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-f4a55e143932ea559cf4bcbd9bcccc14da43d6ed"
Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
import { DestroyArgv } from 'src/cmds/deploy/destroy'
2-
import { removeHelmRelease } from 'src/lib/aks-fullnode'
3-
import {
4-
addOracleMiddleware,
5-
getAzureClusterConfig,
6-
getOracleAzureContext,
7-
OracleArgv,
8-
switchToAzureContextCluster,
9-
} from 'src/lib/oracle'
2+
import { addOracleMiddleware, OracleArgv, switchToAzureContextCluster } from 'src/lib/oracle'
3+
import { removeOracleFullNodeChart } from 'src/lib/oracle-fullnode'
104

115
export const command = 'oracle-fullnode'
126

@@ -17,8 +11,6 @@ type OracleFullNodeDestroyArgv = DestroyArgv & OracleArgv
1711
export const builder = addOracleMiddleware
1812

1913
export const handler = async (argv: OracleFullNodeDestroyArgv) => {
20-
const oracleAzureContext = getOracleAzureContext(argv.primary)
21-
await switchToAzureContextCluster(argv.celoEnv, oracleAzureContext)
22-
const clusterConfig = getAzureClusterConfig(oracleAzureContext)
23-
await removeHelmRelease(argv.celoEnv, clusterConfig)
14+
await switchToAzureContextCluster(argv.celoEnv, argv.context)
15+
await removeOracleFullNodeChart(argv.celoEnv, argv.context)
2416
}

packages/celotool/src/cmds/deploy/destroy/oracle.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {
22
addOracleMiddleware,
3-
getOracleAzureContext,
43
OracleArgv,
54
removeHelmRelease,
65
switchToAzureContextCluster,
@@ -16,7 +15,6 @@ type OracleDestroyArgv = DestroyArgv & OracleArgv
1615
export const builder = addOracleMiddleware
1716

1817
export const handler = async (argv: OracleDestroyArgv) => {
19-
const oracleAzureContext = getOracleAzureContext(argv.primary)
20-
await switchToAzureContextCluster(argv.celoEnv, oracleAzureContext)
21-
await removeHelmRelease(argv.celoEnv, oracleAzureContext)
18+
await switchToAzureContextCluster(argv.celoEnv, argv.context)
19+
await removeHelmRelease(argv.celoEnv, argv.context)
2220
}
Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
import { InitialArgv } from 'src/cmds/deploy/initial'
2-
import { installFullNodeChart } from 'src/lib/aks-fullnode'
3-
import {
4-
addOracleMiddleware,
5-
getAzureClusterConfig,
6-
getOracleAzureContext,
7-
OracleArgv,
8-
switchToAzureContextCluster,
9-
} from 'src/lib/oracle'
2+
import { addOracleMiddleware, OracleArgv, switchToAzureContextCluster } from 'src/lib/oracle'
3+
import { installOracleFullNodeChart } from 'src/lib/oracle-fullnode'
104

115
export const command = 'oracle-fullnode'
126

@@ -17,8 +11,6 @@ type OracleFullNodeInitialArgv = InitialArgv & OracleArgv
1711
export const builder = addOracleMiddleware
1812

1913
export const handler = async (argv: OracleFullNodeInitialArgv) => {
20-
const oracleAzureContext = getOracleAzureContext(argv.primary)
21-
await switchToAzureContextCluster(argv.celoEnv, oracleAzureContext)
22-
const clusterConfig = getAzureClusterConfig(oracleAzureContext)
23-
await installFullNodeChart(argv.celoEnv, clusterConfig)
14+
await switchToAzureContextCluster(argv.celoEnv, argv.context)
15+
await installOracleFullNodeChart(argv.celoEnv, argv.context)
2416
}

packages/celotool/src/cmds/deploy/initial/oracle.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { InitialArgv } from 'src/cmds/deploy/initial'
22
import {
33
addOracleMiddleware,
4-
getOracleAzureContext,
54
installHelmChart,
65
OracleArgv,
76
switchToAzureContextCluster,
@@ -18,15 +17,14 @@ type OracleInitialArgv = InitialArgv &
1817
}
1918

2019
export const builder = (argv: yargs.Argv) => {
21-
return addOracleMiddleware(argv).option('useFullNodes', {
22-
description: 'Uses previously deployed full nodes in the same namespace for RPCs',
20+
return addOracleMiddleware(argv).option('useForno', {
21+
description: 'Uses forno for RPCs from the oracle clients',
2322
default: false,
2423
type: 'boolean',
2524
})
2625
}
2726

2827
export const handler = async (argv: OracleInitialArgv) => {
29-
const oracleAzureContext = getOracleAzureContext(argv.primary)
30-
await switchToAzureContextCluster(argv.celoEnv, oracleAzureContext)
31-
await installHelmChart(argv.celoEnv, oracleAzureContext, argv.useForno)
28+
await switchToAzureContextCluster(argv.celoEnv, argv.context)
29+
await installHelmChart(argv.celoEnv, argv.context, argv.useForno)
3230
}
Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
import { UpgradeArgv } from 'src/cmds/deploy/upgrade'
2-
import { upgradeFullNodeChart } from 'src/lib/aks-fullnode'
3-
import {
4-
addOracleMiddleware,
5-
getAzureClusterConfig,
6-
getOracleAzureContext,
7-
OracleArgv,
8-
switchToAzureContextCluster,
9-
} from 'src/lib/oracle'
2+
import { addOracleMiddleware, OracleArgv, switchToAzureContextCluster } from 'src/lib/oracle'
3+
import { upgradeOracleFullNodeChart } from 'src/lib/oracle-fullnode'
104
import yargs from 'yargs'
115

126
export const command = 'oracle-fullnode'
@@ -24,8 +18,6 @@ export const builder = (argv: yargs.Argv) => {
2418
}
2519

2620
export const handler = async (argv: OracleFullNodeUpgradeArgv) => {
27-
const oracleAzureContext = getOracleAzureContext(argv.primary)
28-
await switchToAzureContextCluster(argv.celoEnv, oracleAzureContext)
29-
const clusterConfig = getAzureClusterConfig(oracleAzureContext)
30-
await upgradeFullNodeChart(argv.celoEnv, clusterConfig, argv.reset)
21+
await switchToAzureContextCluster(argv.celoEnv, argv.context)
22+
await upgradeOracleFullNodeChart(argv.celoEnv, argv.context, argv.reset)
3123
}

packages/celotool/src/cmds/deploy/upgrade/oracle.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { UpgradeArgv } from 'src/cmds/deploy/upgrade'
22
import {
33
addOracleMiddleware,
4-
getOracleAzureContext,
54
OracleArgv,
65
switchToAzureContextCluster,
76
upgradeOracleChart,
@@ -18,15 +17,14 @@ type OracleUpgradeArgv = UpgradeArgv &
1817
}
1918

2019
export const builder = (argv: yargs.Argv) => {
21-
return addOracleMiddleware(argv).option('useFullNodes', {
22-
description: 'Uses previously deployed full nodes in the same namespace for RPCs',
20+
return addOracleMiddleware(argv).option('useForno', {
21+
description: 'Uses forno for RPCs from the oracle clients',
2322
default: false,
2423
type: 'boolean',
2524
})
2625
}
2726

2827
export const handler = async (argv: OracleUpgradeArgv) => {
29-
const oracleAzureContext = getOracleAzureContext(argv.primary)
30-
await switchToAzureContextCluster(argv.celoEnv, oracleAzureContext)
31-
await upgradeOracleChart(argv.celoEnv, oracleAzureContext, argv.useForno)
28+
await switchToAzureContextCluster(argv.celoEnv, argv.context)
29+
await upgradeOracleChart(argv.celoEnv, argv.context, argv.useForno)
3230
}

0 commit comments

Comments
 (0)