Skip to content

Commit 9a7856a

Browse files
gytis-ivaskeviciusgytis-ivaskevicius
authored
Merge pull request #1315 from input-output-hk/release/cardano-services/0.28.x
Release/cardano services/0.28.x
2 parents 4f0181a + 5f4f072 commit 9a7856a

File tree

8 files changed

+31
-36
lines changed

8 files changed

+31
-36
lines changed

‎flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
};
2222

2323
env = {
24-
BUILD_INFO = values.cardano-services.buildInfo;
2524
ALLOWED_ORIGINS = values.backend.allowedOrigins;
2625

2726
NETWORK = config.network;
@@ -68,8 +67,6 @@
6867
port = 3000;
6968

7069
env = {
71-
BUILD_INFO = values.cardano-services.buildInfo;
72-
7370
NETWORK = config.network;
7471
LOGGER_MIN_SEVERITY = values.cardano-services.loggingLevel;
7572
OGMIOS_SRV_SERVICE_NAME = values.backend.ogmiosSrvServiceName;

‎nix/cardano-services/deployments/backend-ingress.nix

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,16 @@
5252
};
5353
}
5454
])
55+
++ (lib.optionals config.providers.handle-provider.enabled [
56+
{
57+
pathType = "Prefix";
58+
path = "/v${lib.last (lib.sort lib.versionOlder values.cardano-services.versions.handle)}/handle";
59+
backend.service = {
60+
name = "${chart.name}-handle-provider";
61+
port.name = "http";
62+
};
63+
}
64+
])
5565
++ [
5666
{
5767
pathType = "Prefix";
@@ -83,16 +93,6 @@
8393
};
8494
}
8595
]
86-
++ lib.optionals config.providers.handle-provider.enabled [
87-
{
88-
pathType = "Prefix";
89-
path = "/v${lib.last (lib.sort lib.versionOlder values.cardano-services.versions.handle)}/handle";
90-
backend.service = {
91-
name = "${chart.name}-handle-provider";
92-
port.name = "http";
93-
};
94-
}
95-
]
9696
++ values.cardano-services.additionalRoutes;
9797
})
9898
values.backend.hostnames;

‎nix/cardano-services/deployments/blockfrost-worker-deployment.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
env = utils.mkPodEnv {
5050
NETWORK = config.network;
5151
LOGGER_MIN_SEVERITY = values.cardano-services.loggingLevel;
52-
BUILD_INFO = values.cardano-services.buildInfo;
5352

5453
BLOCKFROST_API_KEY = {
5554
valueFrom.secretKeyRef = {

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

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -422,13 +422,13 @@ in
422422
env.OVERRIDE_FUZZY_OPTIONS = "true";
423423
};
424424
handle-provider.enabled = true;
425-
# asset-provider.enabled = true;
425+
# asset-provider.enabled = true;
426426
};
427427

428428
projectors = {
429429
handle.enabled = true;
430430
stake-pool.enabled = true;
431-
# asset.enabled = true;
431+
# asset.enabled = true;
432432
};
433433

434434
values = {
@@ -459,7 +459,7 @@ in
459459
env.OVERRIDE_FUZZY_OPTIONS = "true";
460460
env.NODE_ENV = "production";
461461
};
462-
# handle-provider.enabled = true;
462+
handle-provider.enabled = true;
463463
# asset-provider = {
464464
# enabled = true;
465465
# env.NODE_ENV = "production";
@@ -530,7 +530,7 @@ in
530530
env.OVERRIDE_FUZZY_OPTIONS = "true";
531531
env.NODE_ENV = "production";
532532
};
533-
# handle-provider.enabled = true;
533+
handle-provider.enabled = true;
534534
#asset-provider = {
535535
# enabled = true;
536536
# env.NODE_ENV = "production";
@@ -540,7 +540,7 @@ in
540540
projectors = {
541541
handle.enabled = true;
542542
stake-pool.enabled = true;
543-
#asset.enabled = true;
543+
# asset.enabled = true;
544544
};
545545

546546
values = {
@@ -600,7 +600,7 @@ in
600600
env.NODE_ENV = "production";
601601
};
602602
handle-provider = {
603-
enabled = false;
603+
enabled = true;
604604
env.NODE_ENV = "production";
605605
};
606606
#asset-provider = {
@@ -614,7 +614,7 @@ in
614614
stake-pool = {
615615
enabled = true;
616616
};
617-
#asset.enabled = true;
617+
# asset.enabled = true;
618618
};
619619

620620
values = {
@@ -661,7 +661,7 @@ in
661661
env.NODE_ENV = "production";
662662
};
663663
handle-provider = {
664-
enabled = false;
664+
enabled = true;
665665
env.NODE_ENV = "production";
666666
};
667667
#asset-provider = {
@@ -675,7 +675,7 @@ in
675675
stake-pool = {
676676
enabled = true;
677677
};
678-
#asset.enabled = true;
678+
# asset.enabled = true;
679679
};
680680

681681
values = {
@@ -761,7 +761,7 @@ in
761761
env.NODE_ENV = "production";
762762
};
763763
handle-provider = {
764-
enabled = false;
764+
enabled = true;
765765
env.NODE_ENV = "production";
766766
};
767767
#asset-provider = {
@@ -775,7 +775,7 @@ in
775775
stake-pool = {
776776
enabled = true;
777777
};
778-
#asset.enabled = true;
778+
# asset.enabled = true;
779779
};
780780

781781
values = {
@@ -861,7 +861,7 @@ in
861861
env.NODE_ENV = "production";
862862
};
863863
handle-provider = {
864-
enabled = false;
864+
enabled = true;
865865
env.NODE_ENV = "production";
866866
};
867867
# asset-provider = {
@@ -1097,4 +1097,10 @@ in
10971097
# context = "eks-admin";
10981098
#};
10991099
});
1100+
1101+
targetGroups = targets: {
1102+
DEV = lib.filterAttrs (name: _: lib.hasPrefix "dev-" name) targets;
1103+
LIVE = lib.filterAttrs (name: _: lib.hasPrefix "live-" name) targets;
1104+
OPS = lib.filterAttrs (name: _: lib.hasPrefix "ops-" name) targets;
1105+
};
11001106
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
OGMIOS_SRV_SERVICE_NAME = values.backend.ogmiosSrvServiceName;
2929
SERVICE_NAMES = "handle";
3030

31-
BUILD_INFO = values.cardano-services.buildInfo;
3231
ALLOWED_ORIGINS = values.backend.allowedOrigins;
3332

3433
POSTGRES_POOL_MAX_HANDLE = "10";
@@ -72,8 +71,6 @@
7271
PROJECTION_NAMES = "handle";
7372
HANDLE_POLICY_IDS = "f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a";
7473

75-
BUILD_INFO = values.cardano-services.buildInfo;
76-
7774
POSTGRES_POOL_MAX = "2";
7875
POSTGRES_HOST = values.postgresName;
7976
POSTGRES_PORT = "5432";

‎nix/cardano-services/deployments/pg-boss-worker-deployment.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
NETWORK = config.network;
5858
LOGGER_MIN_SEVERITY = values.cardano-services.loggingLevel;
5959
QUEUES = values.pg-boss-worker.queues;
60-
BUILD_INFO = values.cardano-services.buildInfo;
6160

6261
METADATA_FETCH_MODE = values.pg-boss-worker.metadata-fetch-mode;
6362

‎nix/cardano-services/deployments/stake-pool.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
USE_TYPEORM_STAKE_POOL_PROVIDER = "true";
3232
TOKEN_METADATA_SERVER_URL = values.cardano-services.tokenMetadataServerUrl;
3333

34-
BUILD_INFO = values.cardano-services.buildInfo;
3534
ALLOWED_ORIGINS = values.backend.allowedOrigins;
3635

3736
POSTGRES_POOL_MAX_STAKE_POOL = "10";
@@ -74,8 +73,6 @@
7473
OGMIOS_SRV_SERVICE_NAME = values.backend.ogmiosSrvServiceName;
7574
PROJECTION_NAMES = "stake-pool,stake-pool-metadata-job,stake-pool-metrics-job,stake-pool-rewards-job";
7675

77-
BUILD_INFO = values.cardano-services.buildInfo;
78-
7976
POSTGRES_POOL_MAX = "2";
8077
POSTGRES_HOST = values.postgresName;
8178
POSTGRES_PORT = "5432";

0 commit comments

Comments
 (0)