Skip to content

Incorporate grid service websrv into program #343

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

Merged
merged 9 commits into from
May 13, 2025
Merged

Incorporate grid service websrv into program #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
12834f2
#342: Grid.Bot.Grpc
nikita-petko May 13, 2025
136c65b
~ Add new settings to avatar provider:
nikita-petko May 13, 2025
0bd8c9a
#340 #341: Shared.Utility
nikita-petko May 13, 2025
82bcbda
#340 #341: Grid.Bot.Web
nikita-petko May 13, 2025
5675ac3
#340 #341: Shared.Commands
nikita-petko May 13, 2025
2e4d685
Shared.Events
nikita-petko May 13, 2025
bad3b1e
Grid.Bot.Recovery
nikita-petko May 13, 2025
4b461c4
~ Clean up runner code by removing gRPC embedded.
nikita-petko May 13, 2025
89db8bd
#340 #341: Fix port conflicts
nikita-petko May 13, 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
28 changes: 27 additions & 1 deletion services/grid-bot/.component.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,40 @@ deployment:
static: 8101
grpc:
static: 5000
http:
static: 8888
services:
- name: grid-bot-${{ env.NOMAD_SHORT_ENVIRONMENT }}
- name: ${{ env.NOMAD_ENVIRONMENT }}-grid-bot
port: metrics
tags:
- ${{ env.NOMAD_ENVIRONMENT }}
checks:
- type: http
path: /metrics

- name: ${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web
port: http
tags:
- ${{ env.NOMAD_ENVIRONMENT }}
- "traefik.enable=true"
- "traefik.http.routers.${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-http.rule=(HostRegexp(`{host:[a-zA-Z]+}.sitetest4.robloxlabs.com`) || Host(`versioncompatibility.api.sitetest4.robloxlabs.com`))"
- "traefik.http.routers.${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-http.entrypoints=http"
checks:
- type: http
path: /health

- name: ${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-https
port: http
tags:
- ${{ env.NOMAD_ENVIRONMENT }}
- "traefik.enable=true"
- "traefik.http.routers.${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-https.rule=(HostRegexp(`{host:[a-zA-Z]+}.sitetest4.robloxlabs.com`) || Host(`versioncompatibility.api.sitetest4.robloxlabs.com`))"
- "traefik.http.routers.${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-https.entrypoints=https"
- "traefik.http.routers.${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-https.tls=true"
checks:
- type: http
path: /health

volumes:
- '/var/run/docker.sock:/var/run/docker.sock'
- '/tmp/.X11-unix:/tmp/.X11-unix'
Expand Down
14 changes: 14 additions & 0 deletions services/grid-bot/grid-bot-bare.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Settings", "lib\sett
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Utility", "lib\utility\Shared.Utility.csproj", "{AB0EF72D-505F-4F0E-94AD-BA236218CEB7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grid.Bot.Grpc", "lib\grpc\Grid.Bot.Grpc.csproj", "{BDC40A33-FB7D-4B64-8FD1-662092858DA8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grid.Bot.Web", "lib\web\Grid.Bot.Web.csproj", "{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -43,6 +47,14 @@ Global
{AB0EF72D-505F-4F0E-94AD-BA236218CEB7}.Debug|Any CPU.Build.0 = debug|Any CPU
{AB0EF72D-505F-4F0E-94AD-BA236218CEB7}.Release|Any CPU.ActiveCfg = release|Any CPU
{AB0EF72D-505F-4F0E-94AD-BA236218CEB7}.Release|Any CPU.Build.0 = release|Any CPU
{BDC40A33-FB7D-4B64-8FD1-662092858DA8}.Debug|Any CPU.ActiveCfg = debug|Any CPU
{BDC40A33-FB7D-4B64-8FD1-662092858DA8}.Debug|Any CPU.Build.0 = debug|Any CPU
{BDC40A33-FB7D-4B64-8FD1-662092858DA8}.Release|Any CPU.ActiveCfg = release|Any CPU
{BDC40A33-FB7D-4B64-8FD1-662092858DA8}.Release|Any CPU.Build.0 = release|Any CPU
{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642}.Debug|Any CPU.ActiveCfg = debug|Any CPU
{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642}.Debug|Any CPU.Build.0 = debug|Any CPU
{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642}.Release|Any CPU.ActiveCfg = release|Any CPU
{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642}.Release|Any CPU.Build.0 = release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -53,5 +65,7 @@ Global
{67005F02-FE69-4DCF-8D29-07989E8B4C18} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
{425ECFC3-749B-4725-AF7B-A2CC56A06E6B} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
{AB0EF72D-505F-4F0E-94AD-BA236218CEB7} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
{BDC40A33-FB7D-4B64-8FD1-662092858DA8} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
EndGlobalSection
EndGlobal
21 changes: 14 additions & 7 deletions services/grid-bot/grid-bot.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Configuration", "..\..\lib\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Configuration.Core", "..\..\lib\src\configuration\core\Configuration.Core.csproj", "{0F99E3B7-B8A2-4166-94DD-E14E10B82782}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientSettings.Client", "..\..\lib\src\clients\client-settings-client\ClientSettings.Client.csproj", "{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thumbnails.Client", "..\..\lib\src\clients\thumbnails-client\Thumbnails.Client.csproj", "{067AC4F9-F1E9-435B-B837-9A9B05DDD621}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Users.Client", "..\..\lib\src\clients\users-client\Users.Client.csproj", "{8702A9B1-8180-41FE-A639-AFE807B08512}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grid.Bot.Grpc", "lib\grpc\Grid.Bot.Grpc.csproj", "{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grid.Bot.Web", "lib\web\Grid.Bot.Web.csproj", "{3AC6957F-78D6-4872-A0F1-C927FD545033}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -169,10 +171,6 @@ Global
{0F99E3B7-B8A2-4166-94DD-E14E10B82782}.Debug|Any CPU.Build.0 = debug|Any CPU
{0F99E3B7-B8A2-4166-94DD-E14E10B82782}.Release|Any CPU.ActiveCfg = release|Any CPU
{0F99E3B7-B8A2-4166-94DD-E14E10B82782}.Release|Any CPU.Build.0 = release|Any CPU
{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E}.Debug|Any CPU.ActiveCfg = debug|Any CPU
{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E}.Debug|Any CPU.Build.0 = debug|Any CPU
{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E}.Release|Any CPU.ActiveCfg = release|Any CPU
{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E}.Release|Any CPU.Build.0 = release|Any CPU
{067AC4F9-F1E9-435B-B837-9A9B05DDD621}.Debug|Any CPU.ActiveCfg = debug|Any CPU
{067AC4F9-F1E9-435B-B837-9A9B05DDD621}.Debug|Any CPU.Build.0 = debug|Any CPU
{067AC4F9-F1E9-435B-B837-9A9B05DDD621}.Release|Any CPU.ActiveCfg = release|Any CPU
Expand All @@ -181,6 +179,14 @@ Global
{8702A9B1-8180-41FE-A639-AFE807B08512}.Debug|Any CPU.Build.0 = debug|Any CPU
{8702A9B1-8180-41FE-A639-AFE807B08512}.Release|Any CPU.ActiveCfg = release|Any CPU
{8702A9B1-8180-41FE-A639-AFE807B08512}.Release|Any CPU.Build.0 = release|Any CPU
{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C}.Debug|Any CPU.ActiveCfg = debug|Any CPU
{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C}.Debug|Any CPU.Build.0 = debug|Any CPU
{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C}.Release|Any CPU.ActiveCfg = release|Any CPU
{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C}.Release|Any CPU.Build.0 = release|Any CPU
{3AC6957F-78D6-4872-A0F1-C927FD545033}.Debug|Any CPU.ActiveCfg = debug|Any CPU
{3AC6957F-78D6-4872-A0F1-C927FD545033}.Debug|Any CPU.Build.0 = debug|Any CPU
{3AC6957F-78D6-4872-A0F1-C927FD545033}.Release|Any CPU.ActiveCfg = release|Any CPU
{3AC6957F-78D6-4872-A0F1-C927FD545033}.Release|Any CPU.Build.0 = release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -211,8 +217,9 @@ Global
{67C7D321-75F2-4ADC-9C24-BC02E345E0E0} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
{689B303F-6238-4F1A-8F24-2C8B4FE6C8BD} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
{0F99E3B7-B8A2-4166-94DD-E14E10B82782} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
{067AC4F9-F1E9-435B-B837-9A9B05DDD621} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
{8702A9B1-8180-41FE-A639-AFE807B08512} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
{3AC6957F-78D6-4872-A0F1-C927FD545033} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
EndGlobalSection
EndGlobal
Loading