From 8b22e3a4335aa5ab9b1ee26e4c650cd7df9248a2 Mon Sep 17 00:00:00 2001 From: piersy Date: Wed, 17 Jan 2024 10:00:35 +0000 Subject: [PATCH] Simply remove all references to cannoli (#1013) --- apps/block_scout_web/config/navigation.exs | 3 +- helm/helmfiles/cannoli.yaml | 18 ---- helm/values/values-cannoli-blockscout.yaml | 106 --------------------- 3 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 helm/helmfiles/cannoli.yaml delete mode 100644 helm/values/values-cannoli-blockscout.yaml diff --git a/apps/block_scout_web/config/navigation.exs b/apps/block_scout_web/config/navigation.exs index bbf2362ce007..2bd8413d200d 100644 --- a/apps/block_scout_web/config/navigation.exs +++ b/apps/block_scout_web/config/navigation.exs @@ -59,6 +59,5 @@ config :block_scout_web, other_networks: [ %{title: "Celo Mainnet", url: "https://explorer.celo.org/mainnet", test_net?: false}, %{title: "Celo Alfajores", url: "https://explorer.celo.org/alfajores", test_net?: true}, - %{title: "Celo Baklava", url: "https://explorer.celo.org/baklava", test_net?: true}, - %{title: "Celo Cannoli", url: "https://explorer.celo.org/cannoli", test_net?: true} + %{title: "Celo Baklava", url: "https://explorer.celo.org/baklava", test_net?: true} ] diff --git a/helm/helmfiles/cannoli.yaml b/helm/helmfiles/cannoli.yaml deleted file mode 100644 index 290969504d56..000000000000 --- a/helm/helmfiles/cannoli.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -releases: - - name: cannoli-blockscout - chart: oci://us-west1-docker.pkg.dev/devopsre/clabs-public-oci/blockscout - version: ~1 - createNamespace: true - namespace: cannoli - missingFileHandler: Error - values: - - ../values/values-cannoli-blockscout.yaml - - changeCause: {{ env "CHANGE_CAUSE" }} -{{ $imageTag := trim (env "BLOCKSCOUT_IMAGE_TAG") | default "" }} -{{ if ne $imageTag "" }} - - blockscout: - shared: - image: - tag: {{ $imageTag }} -{{ end }} diff --git a/helm/values/values-cannoli-blockscout.yaml b/helm/values/values-cannoli-blockscout.yaml deleted file mode 100644 index b2ca21dd5ebc..000000000000 --- a/helm/values/values-cannoli-blockscout.yaml +++ /dev/null @@ -1,106 +0,0 @@ ---- -blockscout: - indexer: - db: - connectionName: cannoli-380909:us-west1:cannoli - proxy: - resources: - requests: - memory: 10M - cpu: 10m - limits: - memory: 100Mi - cpu: 200m - poolSize: 50 - resources: - requests: - memory: 200M - cpu: 1 - limits: - memory: 400M - cpu: 2 - affinity: {} - api: - hostname: blockscout.api.cannoli.celo-testnet.org - autoscaling: - maxReplicas: 2 - minReplicas: 1 - target: - cpu: 70 - db: - connectionName: cannoli-380909:us-west1:cannoli-replica - proxy: - resources: - requests: - memory: 10M - cpu: 10m - poolSize: 5 - resources: - requests: - memory: 100M - cpu: 0.2 - limits: - memory: 400M - cpu: 0.5 - affinity: {} - web: - hostname: blockscout.cannoli.celo-testnet.org - suffix: - enabled: true - path: "cannoli" - extraEnvironments: - target: - - sourceHost: explorer.celo.org - autoscaling: - maxReplicas: 2 - minReplicas: 1 - target: - cpu: 85 - db: - connectionName: cannoli-380909:us-west1:cannoli-replica - proxy: - resources: - requests: - memory: 10M - cpu: 10m - poolSize: 10 - resources: - requests: - memory: 100M - cpu: 50m - limits: - memory: 300M - cpu: 0.25 - affinity: {} - metadataCrawler: - enabled: false - shared: - image: - repository: gcr.io/celo-testnet/blockscout - tag: 6dd0c330fd4916e6ff52d2ee494a71a16a63d15a - secrets: - # segmentKey: gcp:secretmanager:projects/411900421062/secrets/cannoli-blockscout-segmentKey - dbUser: blockscout - dbPassword: gcp:secretmanager:projects/411900421062/secrets/cannoli-blockscout-cloudsql-blockscout - # grafanaCloud: gcp:secretmanager:projects/411900421062/secrets/cannoli-blockscout-grafanaCloud - # recaptcha_projectId: gcp:secretmanager:projects/411900421062/secrets/cannoli-blockscout-recaptchaProjectId - # recaptcha_siteKey: gcp:secretmanager:projects/411900421062/secrets/cannoli-blockscout-recaptchaSiteKey - # recaptcha_apiKey: gcp:secretmanager:projects/411900421062/secrets/cannoli-blockscout-recaptchaApiKey - # recaptcha_secretKey: gcp:secretmanager:projects/411900421062/secrets/cannoli-blockscout-recaptchaSecretKey - erlang_cookie: gcp:secretmanager:projects/411900421062/secrets/cannoli-blockscout-erlangCookie - # campaignBannerApiUrl: gcp:secretmanager:projects/411900421062/secrets/cannoli-blockscout-campaignBannerApiUrl -network: - name: Celo - networkID: 17323 - nodes: - archiveNodes: - jsonrpcHttpUrl: http://tx-nodes-private:8545 - jsonrpcWsUrl: ws://tx-nodes-private:8545 - fullNodes: - jsonrpcPublicHttp: https://forno.cannoli.celo-testnet.org - -infrastructure: - metrics: - enabled: true - gcp: - projectId: cannoli-380909