Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(kupo): update kupo for extra annotations #199

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+62 −77
Open

feat(kupo): update kupo for extra annotations #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1fb513
fix(utxorpc): update utxorpc module to upstream
verbotenj Feb 18, 2025
45ce098
feat(kupo): update kupo for extra annotations
verbotenj Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions stage3/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions stage3/env.auto.tfvars.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,11 @@
# enable_cardano_ogmios = false
# enable_cardano_kupo = false
# enable_cardano_utxorpc = false
# kupo_proxy_blue_extra_annotations = {
# "external-dns.alpha.kubernetes.io/cloudflare-proxied" = "true"
# "external-dns.alpha.kubernetes.io/hostname" = "proxy-blue.kupo.dmtr.host"
# }
# kupo_proxy_green_extra_annotations = {
# "external-dns.alpha.kubernetes.io/cloudflare-proxied" = "true"
# "external-dns.alpha.kubernetes.io/hostname" = "proxy-green.kupo.dmtr.host"
# }
23 changes: 13 additions & 10 deletions stage3/kupo.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ module "ext_cardano_kupo_crds" {
}

module "ext_cardano_kupo" {
source = "git::https://github.com/demeter-run/ext-cardano-kupo.git//bootstrap"
# source = "git::https://github.com/demeter-run/ext-cardano-kupo.git//bootstrap"
source = "git::https://github.com/blinklabs-io/demeter-ext-cardano-kupo.git//bootstrap?ref=feat/add-extra-annotations"
for_each = toset([for n in toset(["v1"]) : n if var.enable_cardano_kupo])
namespace = "ftr-kupo-${each.key}"
cloud_provider = var.cloud_provider
Expand All @@ -52,15 +53,17 @@ module "ext_cardano_kupo" {
# per_min_dcus = local.kupo_v1_per_min_dcus
# per_request_dcus = local.kupo_v1_per_request_dcus
# track_dcu_usage = local.kupo_v1_track_dcu_usage
api_key_salt = local.kupo_v1_api_key_salt
ingress_class = local.kupo_v1_ingress_class
extension_subdomain = local.kupo_v1_extension_subdomain
dns_zone = local.kupo_v1_dns_zone
proxy_green_image_tag = local.kupo_v1_proxy_green_image_tag
proxy_green_replicas = local.kupo_v1_proxy_green_replicas
proxy_blue_image_tag = local.kupo_v1_proxy_blue_image_tag
proxy_blue_replicas = local.kupo_v1_proxy_blue_replicas
proxy_resources = local.kupo_v1_proxy_resources
api_key_salt = local.kupo_v1_api_key_salt
ingress_class = local.kupo_v1_ingress_class
extension_subdomain = local.kupo_v1_extension_subdomain
dns_zone = local.kupo_v1_dns_zone
proxy_green_extra_annotations = var.kupo_proxy_green_extra_annotations
proxy_green_image_tag = local.kupo_v1_proxy_green_image_tag
proxy_green_replicas = local.kupo_v1_proxy_green_replicas
proxy_blue_extra_annotations = var.kupo_proxy_blue_extra_annotations
proxy_blue_image_tag = local.kupo_v1_proxy_blue_image_tag
proxy_blue_replicas = local.kupo_v1_proxy_blue_replicas
proxy_resources = local.kupo_v1_proxy_resources
cells = {
"cell1" = {
pvc = {
Expand Down
69 changes: 16 additions & 53 deletions stage3/utxorpc.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,15 @@
locals {
// Defaults for UtxoRPC
utxorpc_defaults = {
namespace = "ext-utxorpc-m0"
dns_zone = "dmtr.host"
operator_image_tag = "0ecf1644a0554d3c34f4256b6765c80a02986e15"
networks = ["cardano-mainnet", "cardano-preprod", "cardano-preview"]
cloudflared_image_tag = "latest"
cloudflared_replicas = 0
cloudflared_resources = {
limits = {
cpu = "2"
memory = "500Mi"
}
requests = {
cpu = "50m"
memory = "500Mi"
}
namespace = "ext-utxorpc-m0"
dns_zone = "dmtr.host"
operator_image_tag = "0ecf1644a0554d3c34f4256b6765c80a02986e15"
networks = ["cardano-mainnet", "cardano-preprod", "cardano-preview"]
extension_url_per_network = {
"cardano-mainnet" = "utxorpc-m0.demeter.run"
"cardano-preprod" = "utxorpc-preprod.demeter.run"
"cardano-preview" = "utxorpc-preview.demeter.run"
}
cloudflared_tolerations = [
{
effect = "NoSchedule"
key = "demeter.run/compute-profile"
operator = "Exists"
},
{
effect = "NoSchedule"
key = "demeter.run/compute-arch"
operator = "Exists"
},
{
effect = "NoSchedule"
key = "demeter.run/availability-sla"
operator = "Exists"
}
]
proxies_image_tag = "7941eec9a681ace6fdaeb7e18d9fb2b26d3cfae3"
proxies_replicas = 1
proxies_resources = {
Expand Down Expand Up @@ -64,12 +40,9 @@ locals {
operator = "Exists"
}
]
cloudflared_tunnel_id = "default-tunnel-id"
cloudflared_tunnel_secret = "default-tunnel-secret"
cloudflared_account_tag = "default-account-tag"
dolos_version = "sha-e0f42cf"
extension_subdomain = "utxorpc"
api_key_salt = "this is a random generated key and must be shared..."
dolos_version = "sha-e0f42cf"
extension_subdomain = "utxorpc"
api_key_salt = "this is a random generated key and must be shared..."
}
}

Expand All @@ -82,28 +55,18 @@ module "ext_cardano_utxorpc" {
source = "git::https://github.com/demeter-run/ext-cardano-utxorpc//bootstrap/"
for_each = toset([for n in toset(["v1"]) : n if var.enable_cardano_utxorpc])

operator_image_tag = local.utxorpc_defaults.operator_image_tag
extension_subdomain = local.utxorpc_defaults.extension_subdomain
dns_zone = local.utxorpc_defaults.dns_zone
api_key_salt = local.utxorpc_defaults.api_key_salt
namespace = local.utxorpc_defaults.namespace
networks = local.utxorpc_defaults.networks
operator_image_tag = local.utxorpc_defaults.operator_image_tag
extension_url_per_network = local.utxorpc_defaults.extension_url_per_network
api_key_salt = local.utxorpc_defaults.api_key_salt
namespace = local.utxorpc_defaults.namespace
networks = local.utxorpc_defaults.networks

network_addresses = {
# "cardano-mainnet" : "relay.utxorpc-m0.demeter.run:3000"
# "cardano-preprod" : "relay.utxorpc-m0.demeter.run:3001"
# "cardano-preview" : "relay.utxorpc-m0.demeter.run:3002"
}

// Cloudflared
cloudflared_tunnel_id = local.utxorpc_defaults.cloudflared_tunnel_id
cloudflared_tunnel_secret = local.utxorpc_defaults.cloudflared_tunnel_secret
cloudflared_account_tag = local.utxorpc_defaults.cloudflared_account_tag
cloudflared_image_tag = local.utxorpc_defaults.cloudflared_image_tag
cloudflared_replicas = local.utxorpc_defaults.cloudflared_replicas
cloudflared_resources = local.utxorpc_defaults.cloudflared_resources
cloudflared_tolerations = local.utxorpc_defaults.cloudflared_tolerations

// Proxies
proxies_image_tag = local.utxorpc_defaults.proxies_image_tag
proxies_replicas = local.utxorpc_defaults.proxies_replicas
Expand Down
12 changes: 12 additions & 0 deletions stage3/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,18 @@ variable "enable_cardano_kupo" {
default = false
}

variable "kupo_proxy_blue_extra_annotations" {
description = "Extra annotations for the proxy blue service"
type = map(string)
default = {}
}

variable "kupo_proxy_green_extra_annotations" {
description = "Extra annotations for the proxy green service"
type = map(string)
default = {}
}

variable "kupo_v1_api_key_salt" {
description = "shared salt used for generating API keys"
default = ""
Expand Down