Skip to content

Commit 6542913

Browse files
gytis-ivaskeviciusgytis-ivaskevicius
authored
Merge pull request #1473 from input-output-hk/release/be/0.30.0
Release/be/0.30.0
2 parents 49bb0a3 + 0132f03 commit 6542913

File tree

4 files changed

+47
-152
lines changed

4 files changed

+47
-152
lines changed

‎nix/cardano-services/deployments/default.nix‎

Lines changed: 42 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# cSpell:ignore builtins cardanojs concat devs healthchecks hostnames kubeconfig pkgs stakepool stakepoolv
2-
32
{
43
pkgs,
54
lib ? pkgs.lib,
@@ -119,7 +118,8 @@ in
119118
stakepool.databaseName = "stakepool";
120119
ingress.enabled = true;
121120
cardano-services = {
122-
nodeEnv = if lib.hasPrefix "live" final.namespace
121+
nodeEnv =
122+
if lib.hasPrefix "live" final.namespace
123123
then "production"
124124
else null;
125125
image = oci.image.name;
@@ -258,7 +258,6 @@ in
258258
};
259259
};
260260

261-
262261
"dev-sanchonet@us-east-1" = final: {
263262
name = "${final.namespace}-cardanojs";
264263
namespace = "dev-sanchonet";
@@ -293,7 +292,6 @@ in
293292
};
294293
};
295294

296-
297295
"dev-mainnet@us-east-1" = final: {
298296
namespace = "dev-mainnet";
299297
network = "mainnet";
@@ -438,25 +436,19 @@ in
438436
enabled = true;
439437
replicas = 4;
440438
};
441-
stake-pool-provider = {
442-
enabled = true;
443-
};
439+
stake-pool-provider.enabled = true;
444440
handle-provider.enabled = true;
445441
chain-history-provider = {
446442
enabled = true;
447443
replicas = 2;
448444
};
449-
# asset-provider = {
450-
# enabled = true;
451-
# };
445+
asset-provider.enabled = true;
452446
};
453447

454448
projectors = {
455449
handle.enabled = true;
456-
stake-pool = {
457-
enabled = true;
458-
};
459-
# asset.enabled = true;
450+
stake-pool.enabled = true;
451+
asset.enabled = true;
460452
};
461453

462454
values = {
@@ -493,23 +485,19 @@ in
493485
enabled = true;
494486
replicas = 4;
495487
};
496-
stake-pool-provider = {
497-
enabled = true;
498-
};
499-
handle-provider.enabled = true;
500488
chain-history-provider = {
501489
enabled = true;
502490
replicas = 2;
503491
};
504-
#asset-provider = {
505-
# enabled = true;
506-
#};
492+
stake-pool-provider.enabled = true;
493+
handle-provider.enabled = true;
494+
asset-provider.enabled = true;
507495
};
508496

509497
projectors = {
510498
handle.enabled = true;
511499
stake-pool.enabled = true;
512-
# asset.enabled = true;
500+
asset.enabled = true;
513501
};
514502

515503
values = {
@@ -569,7 +557,6 @@ in
569557
};
570558

571559
values = {
572-
573560
cardano-services = {
574561
ingresOrder = 98;
575562
additionalRoutes = [
@@ -584,23 +571,6 @@ in
584571
];
585572
};
586573
backend.allowedOrigins = lib.concatStringsSep "," allowedOrigins;
587-
backend.routes = let
588-
inherit (oci.meta) versions;
589-
in
590-
lib.concatLists [
591-
(map (v: "/v${v}/health") versions.root)
592-
(map (v: "/v${v}/live") versions.root)
593-
(map (v: "/v${v}/meta") versions.root)
594-
(map (v: "/v${v}/ready") versions.root)
595-
(map (v: "/v${v}/asset") versions.assetInfo)
596-
(map (v: "/v${v}/chain-history") versions.chainHistory)
597-
(map (v: "/v${v}/network-info") versions.networkInfo)
598-
(map (v: "/v${v}/rewards") versions.rewards)
599-
(map (v: "/v${v}/tx-submit") versions.txSubmit)
600-
(map (v: "/v${v}/utxo") versions.utxo)
601-
(map (v: "/v${v}/handle") versions.handle)
602-
];
603-
604574
blockfrost-worker.enabled = true;
605575
pg-boss-worker.enabled = true;
606576
};
@@ -614,27 +584,17 @@ in
614584
region = "us-east-2";
615585

616586
providers = {
617-
backend = {
618-
enabled = true;
619-
};
620-
stake-pool-provider = {
621-
enabled = true;
622-
};
623-
handle-provider = {
624-
enabled = true;
625-
};
587+
backend.enabled = true;
588+
stake-pool-provider.enabled = true;
589+
handle-provider.enabled = true;
626590
chain-history-provider.enabled = true;
627-
#asset-provider = {
628-
# enabled = true;
629-
#};
591+
asset-provider.enabled = true;
630592
};
631593

632594
projectors = {
633595
handle.enabled = true;
634-
stake-pool = {
635-
enabled = true;
636-
};
637-
# asset.enabled = true;
596+
stake-pool.enabled = true;
597+
asset.enabled = true;
638598
};
639599

640600
values = {
@@ -655,27 +615,17 @@ in
655615
region = "eu-central-1";
656616

657617
providers = {
658-
backend = {
659-
enabled = true;
660-
};
661-
stake-pool-provider = {
662-
enabled = true;
663-
};
664-
handle-provider = {
665-
enabled = true;
666-
};
618+
backend.enabled = true;
619+
stake-pool-provider.enabled = true;
620+
handle-provider. enabled = true;
667621
chain-history-provider.enabled = true;
668-
#asset-provider = {
669-
# enabled = true;
670-
#};
622+
asset-provider.enabled = true;
671623
};
672624

673625
projectors = {
674626
handle.enabled = true;
675-
stake-pool = {
676-
enabled = true;
677-
};
678-
# asset.enabled = true;
627+
stake-pool.enabled = true;
628+
asset.enabled = true;
679629
};
680630

681631
values = {
@@ -696,27 +646,17 @@ in
696646
region = "us-east-2";
697647

698648
providers = {
699-
backend = {
700-
enabled = true;
701-
};
702-
stake-pool-provider = {
703-
enabled = true;
704-
};
705-
handle-provider = {
706-
enabled = true;
707-
};
649+
backend.enabled = true;
650+
stake-pool-provider.enabled = true;
651+
handle-provider.enabled = true;
708652
chain-history-provider.enabled = true;
709-
#asset-provider = {
710-
# enabled = true;
711-
#};
653+
asset-provider.enabled = true;
712654
};
713655

714656
projectors = {
715657
handle.enabled = true;
716-
stake-pool = {
717-
enabled = true;
718-
};
719-
# asset.enabled = true;
658+
stake-pool.enabled = true;
659+
asset.enabled = true;
720660
};
721661

722662
values = {
@@ -737,27 +677,17 @@ in
737677
region = "eu-central-1";
738678

739679
providers = {
740-
backend = {
741-
enabled = true;
742-
};
743-
stake-pool-provider = {
744-
enabled = true;
745-
};
746-
handle-provider = {
747-
enabled = true;
748-
};
680+
backend.enabled = true;
681+
stake-pool-provider.enabled = true;
682+
handle-provider.enabled = true;
749683
chain-history-provider.enabled = true;
750-
#asset-provider = {
751-
# enabled = true;
752-
#};
684+
asset-provider.enabled = true;
753685
};
754686

755687
projectors = {
756688
handle.enabled = true;
757-
stake-pool = {
758-
enabled = true;
759-
};
760-
# asset.enabled = true;
689+
stake-pool.enabled = true;
690+
asset.enabled = true;
761691
};
762692

763693
values = {
@@ -777,15 +707,10 @@ in
777707
region = "us-east-1";
778708

779709
providers = {
780-
backend = {
781-
enabled = true;
782-
};
710+
backend.enabled = true;
783711
handle-provider.enabled = true;
784712
chain-history-provider.enabled = true;
785-
stake-pool-provider = {
786-
enabled = true;
787-
env.OVERRIDE_FUZZY_OPTIONS = "true";
788-
};
713+
stake-pool-provider.enabled = true;
789714
};
790715

791716
projectors = {
@@ -794,7 +719,6 @@ in
794719
wallet-api.enabled = true;
795720
};
796721

797-
798722
values = {
799723
pg-boss-worker.enabled = true;
800724
pg-boss-worker.queues = "pool-delist-schedule,pool-metadata,pool-metrics,pool-rewards";
@@ -851,24 +775,6 @@ in
851775
pg-boss-worker.enabled = true;
852776

853777
backend.allowedOrigins = lib.concatStringsSep "," allowedOriginsDev;
854-
backend.routes = let
855-
inherit (oci.meta) versions;
856-
in
857-
lib.concatLists [
858-
(map (v: "/v${v}/health") versions.root)
859-
(map (v: "/v${v}/live") versions.root)
860-
(map (v: "/v${v}/meta") versions.root)
861-
(map (v: "/v${v}/ready") versions.root)
862-
(map (v: "/v${v}/asset") versions.assetInfo)
863-
(map (v: "/v${v}/chain-history") versions.chainHistory)
864-
(map (v: "/v${v}/network-info") versions.networkInfo)
865-
(map (v: "/v${v}/rewards") versions.rewards)
866-
(map (v: "/v${v}/tx-submit") versions.txSubmit)
867-
(map (v: "/v${v}/utxo") versions.utxo)
868-
(map (v: "/v${v}/handle") versions.handle)
869-
(map (v: "/v${v}/provider-server") versions.stakePool)
870-
(map (v: "/v${v}/stake-pool-provider-server") versions.stakePool)
871-
];
872778

873779
cardano-services = {
874780
ingresOrder = 99;
@@ -961,38 +867,28 @@ in
961867
};
962868
};
963869
};
964-
965870
}
966871
# Convenient for cases when you need to create multiple temporary deployments with the same configuration
967872
// (builtins.mapAttrs (_: value: (final:
968873
value
969874
// {
970-
projectors = {
971-
stake-pool.enabled = true;
972-
};
973-
974-
providers = {
975-
backend = {
976-
enabled = true;
977-
};
978-
};
875+
context = "eks-admin";
876+
projectors.asset.enabled = true;
979877

980878
values = {
981-
stakepool.databaseName = "stakepoolv3";
982879
ingress.enabled = false;
983-
pg-boss-worker.enabled = true;
984880
};
985881
})) {
986-
#"live-preview@us-east-2@tmp" = {
882+
#"live-mainnet@us-east-2@asset" = {
987883
# name = "tmp-cardanojs";
988-
# namespace = "live-preview";
989-
# network = "preview";
884+
# namespace = "live-mainnet";
885+
# network = "mainnet";
990886
# region = "us-east-2";
991-
# context = "eks-admin";
992887
#};
993888
});
994889

995890
targetGroups = targets: {
891+
#ASSET = lib.filterAttrs (name: _: lib.hasSuffix "asset" name) targets;
996892
DEV = lib.filterAttrs (name: _: lib.hasPrefix "dev-" name) targets;
997893
LIVE = lib.filterAttrs (name: _: lib.hasPrefix "live-" name) targets;
998894
OPS = lib.filterAttrs (name: _: lib.hasPrefix "ops-" name) targets;

‎nix/cardano-services/deployments/wallet-api.nix‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
chart,
77
...
88
}: {
9-
109
projectors.wallet-api = {
1110
inherit (values.cardano-services) image;
1211
livenessProbe = {

‎nix/cardano-services/deployments/ws-server.deployment.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@
6565
runAsGroup = 0;
6666
};
6767
args = ["start-ws-server"];
68-
env = utils.mkPodEnv ({
68+
env = utils.mkPodEnv {
6969
NETWORK = config.network;
7070
DB_CACHE_TTL = "7200";
71-
OGMIOS_URL = "ws://${config.namespace}-cardano-core.${config.namespace}.svc.cluster.local:1337";
71+
OGMIOS_URL = "ws://${config.namespace}-cardano-core.${config.namespace}.svc.cluster.local:1337";
7272

7373
POSTGRES_POOL_MAX_DB_SYNC = "2";
7474
POSTGRES_HOST_DB_SYNC = values.postgresName;
@@ -88,7 +88,7 @@
8888
};
8989
POSTGRES_SSL_DB_SYNC = "true";
9090
POSTGRES_SSL_CA_FILE_DB_SYNC = "/tls/ca.crt";
91-
});
91+
};
9292
volumeMounts = [
9393
{
9494
mountPath = "/tls";

‎nix/cardano-services/oci-images.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ let
33

44
# TODO: express this as OCI labels (what they are for)
55
buildInfo = builtins.toJSON {
6-
inherit (self) lastModifiedDate ;
7-
rev = self.dirtyRev or self.rev ;
6+
inherit (self) lastModifiedDate;
7+
rev = self.dirtyRev or self.rev;
88
shortRev = self.shortRev or self.dirtyShortRev;
99
};
1010

0 commit comments

Comments
 (0)