Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion Applications/AdminApi/src/AdminApi/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
using Backbone.Modules.Tokens.Application;
using Backbone.Modules.Tokens.Module;
using Backbone.Tooling.Extensions;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Logging;
using Serilog;
Expand Down Expand Up @@ -204,7 +205,18 @@ static void Configure(WebApplication app, AdminApiConfiguration configuration)
app.MapControllers();
app.MapFallbackToFile("{*path:regex(^(?!api/).*$)}", "index.html"); // don't match paths beginning with "api/"

app.MapHealthChecks("/health");
app.MapHealthChecks("/health", new HealthCheckOptions
{
Predicate = _ => false
});
app.MapHealthChecks("/health/ready", new HealthCheckOptions
{
Predicate = _ => true
});
app.MapHealthChecks("/health/live", new HealthCheckOptions
{
Predicate = _ => false
});
}

public partial class Program
Expand Down
14 changes: 13 additions & 1 deletion Applications/ConsumerApi/src/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
using Backbone.Modules.Tokens.Infrastructure.Persistence.Database;
using Backbone.Modules.Tokens.Module;
using Backbone.Tooling.Extensions;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Logging;
Expand Down Expand Up @@ -214,7 +215,18 @@ static void Configure(WebApplication app, ConsumerApiConfiguration configuration

app.UseAuthentication().UseAuthorization();
app.MapControllers();
app.MapHealthChecks("/health");
app.MapHealthChecks("/health", new HealthCheckOptions
{
Predicate = _ => false
});
app.MapHealthChecks("/health/ready", new HealthCheckOptions
{
Predicate = _ => true
});
app.MapHealthChecks("/health/live", new HealthCheckOptions
{
Predicate = _ => false
});

app.UseResponseCaching();
}
Expand Down
14 changes: 13 additions & 1 deletion Applications/SseServer/src/SseServer/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Backbone.SseServer.Controllers;
using Backbone.SseServer.Extensions;
using Backbone.Tooling.Extensions;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.Extensions.Options;
using Serilog;
Expand Down Expand Up @@ -149,7 +150,18 @@ static void Configure(WebApplication app, Configuration configuration)

app.MapControllers();

app.MapHealthChecks("/health");
app.MapHealthChecks("/health", new HealthCheckOptions
{
Predicate = _ => false
});
app.MapHealthChecks("/health/ready", new HealthCheckOptions
{
Predicate = _ => true
});
app.MapHealthChecks("/health/live", new HealthCheckOptions
{
Predicate = _ => false
});
}

static void LoadConfiguration(WebApplicationBuilder webApplicationBuilder, string[] strings)
Expand Down
4 changes: 2 additions & 2 deletions helm/templates/adminui/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ spec:
protocol: TCP
livenessProbe:
httpGet:
path: /health
path: /health/live
port: 8080
initialDelaySeconds: {{ .Values.adminui.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminui.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.adminui.livenessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.adminui.livenessProbe.failureThreshold }}
readinessProbe:
httpGet:
path: /health
path: /health/ready
port: 8080
initialDelaySeconds: {{ .Values.adminui.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminui.readinessProbe.periodSeconds }}
Expand Down
4 changes: 2 additions & 2 deletions helm/templates/consumerapi/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ spec:
{{- include "generateEnvVars" (list .Values.global.env .Values.consumerapi.env) | nindent 12 }}
livenessProbe:
httpGet:
path: /health
path: /health/live
port: 8080
initialDelaySeconds: {{ .Values.consumerapi.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.consumerapi.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.consumerapi.livenessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.consumerapi.livenessProbe.failureThreshold }}
readinessProbe:
httpGet:
path: /health
path: /health/ready
port: 8080
initialDelaySeconds: {{ .Values.consumerapi.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.consumerapi.readinessProbe.periodSeconds }}
Expand Down
4 changes: 2 additions & 2 deletions helm/templates/sseserver/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ spec:
{{- include "generateEnvVars" (list .Values.global.env .Values.sseserver.env) | nindent 12 }}
livenessProbe:
httpGet:
path: /health
path: /health/live
port: 8080
initialDelaySeconds: {{ .Values.sseserver.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.sseserver.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.sseserver.livenessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.sseserver.livenessProbe.failureThreshold }}
readinessProbe:
httpGet:
path: /health
path: /health/ready
port: 8080
initialDelaySeconds: {{ .Values.sseserver.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.sseserver.readinessProbe.periodSeconds }}
Expand Down
Loading