From 73d21213ac074638f13dd2197fa43da1c7863d09 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 11 Oct 2023 19:27:14 -0400 Subject: [PATCH 1/2] POD_NAME + NAMESPACE_NAME --- app/Program.cs | 6 ++++-- score/score.yaml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Program.cs b/app/Program.cs index 5273111..0adaff2 100644 --- a/app/Program.cs +++ b/app/Program.cs @@ -3,7 +3,9 @@ var builder = WebApplication.CreateSlimBuilder(args); var app = builder.Build(); -var message = builder.Configuration["MESSAGE"]; +var message = builder.Configuration["MESSAGE"] ?? "Hello, World!"; +var pod = builder.Configuration["POD_NAME"]; +var namespace = builder.Configuration["NAMESPACE_NAME"]; -app.MapGet("/", () => message ?? "Hello, World!"); +app.MapGet("/", () => string.IsNullOrEmpty(pod) || string.IsNullOrEmpty(namespace) ? message : $"{message} - from {pod} / {namespace}."); app.Run(); diff --git a/score/score.yaml b/score/score.yaml index 1e05cc4..86a36d9 100644 --- a/score/score.yaml +++ b/score/score.yaml @@ -6,6 +6,8 @@ containers: image: my-sample-app variables: MESSAGE: "Hello, World!" + POD_NAME: "${pod.metadata.name}" + NAMESPACE_NAME: "${pod.metadata.namespace}" resources: dns: type: dns From 15d4bfcda73aefdafead0e77ae111c1d25a06d34 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 11 Oct 2023 19:33:59 -0400 Subject: [PATCH 2/2] podName + namespaceName --- app/Program.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Program.cs b/app/Program.cs index 0adaff2..d04dc9d 100644 --- a/app/Program.cs +++ b/app/Program.cs @@ -4,8 +4,8 @@ var app = builder.Build(); var message = builder.Configuration["MESSAGE"] ?? "Hello, World!"; -var pod = builder.Configuration["POD_NAME"]; -var namespace = builder.Configuration["NAMESPACE_NAME"]; +var podName = builder.Configuration["POD_NAME"]; +var namespaceName = builder.Configuration["NAMESPACE_NAME"]; -app.MapGet("/", () => string.IsNullOrEmpty(pod) || string.IsNullOrEmpty(namespace) ? message : $"{message} - from {pod} / {namespace}."); +app.MapGet("/", () => string.IsNullOrEmpty(podName) || string.IsNullOrEmpty(namespaceName) ? message : $"{message} - from {podName} / {namespaceName}."); app.Run();