From 37190d9471fccaf923c2ce0e711a1663549f0bb9 Mon Sep 17 00:00:00 2001 From: Rui Lopes Date: Sun, 17 Mar 2024 10:15:04 +0000 Subject: [PATCH] configure the otel-example container readiness probe --- config.tm.hcl | 2 +- stacks/ecr/_inputs.auto.tfvars | 2 +- stacks/eks-workloads/_inputs.auto.tfvars | 2 +- stacks/eks-workloads/otel-example.tf | 21 +++++++++++++++------ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/config.tm.hcl b/config.tm.hcl index efcbffd..a899d41 100644 --- a/config.tm.hcl +++ b/config.tm.hcl @@ -22,7 +22,7 @@ globals { otel-example = { name = "ghcr.io/rgl/opentelemetry-dotnet-playground" # renovate: datasource=docker depName=rgl/opentelemetry-dotnet-playground registryUrl=https://ghcr.io - tag = "0.0.4" + tag = "0.0.6" } kubernetes-hello = { # see https://hub.docker.com/repository/docker/ruilopes/kubernetes-hello diff --git a/stacks/ecr/_inputs.auto.tfvars b/stacks/ecr/_inputs.auto.tfvars index dc36fa4..9b774e4 100644 --- a/stacks/ecr/_inputs.auto.tfvars +++ b/stacks/ecr/_inputs.auto.tfvars @@ -8,7 +8,7 @@ images = { } otel-example = { name = "ghcr.io/rgl/opentelemetry-dotnet-playground" - tag = "0.0.4" + tag = "0.0.6" } } project = "aws-eks-example" diff --git a/stacks/eks-workloads/_inputs.auto.tfvars b/stacks/eks-workloads/_inputs.auto.tfvars index 48e0838..877a9a9 100644 --- a/stacks/eks-workloads/_inputs.auto.tfvars +++ b/stacks/eks-workloads/_inputs.auto.tfvars @@ -12,7 +12,7 @@ source_images = { } otel-example = { name = "ghcr.io/rgl/opentelemetry-dotnet-playground" - tag = "0.0.4" + tag = "0.0.6" } } stack = "03b490d2-21d2-4bff-bbea-77ee2f74de35" diff --git a/stacks/eks-workloads/otel-example.tf b/stacks/eks-workloads/otel-example.tf index b8065de..a1cb0fe 100644 --- a/stacks/eks-workloads/otel-example.tf +++ b/stacks/eks-workloads/otel-example.tf @@ -52,12 +52,13 @@ resource "kubernetes_ingress_v1" "otel_example" { metadata { name = "otel-example" annotations = { - "alb.ingress.kubernetes.io/scheme" = "internet-facing" - "alb.ingress.kubernetes.io/target-type" = "ip" - "alb.ingress.kubernetes.io/group.name" = var.ingress_domain - "alb.ingress.kubernetes.io/listen-ports" = "[{\"HTTP\":80},{\"HTTPS\":443}]" - "alb.ingress.kubernetes.io/ssl-redirect" = "443" - "alb.ingress.kubernetes.io/ssl-policy" = "ELBSecurityPolicy-TLS13-1-2-2021-06" + "alb.ingress.kubernetes.io/scheme" = "internet-facing" + "alb.ingress.kubernetes.io/target-type" = "ip" + "alb.ingress.kubernetes.io/group.name" = var.ingress_domain + "alb.ingress.kubernetes.io/listen-ports" = "[{\"HTTP\":80},{\"HTTPS\":443}]" + "alb.ingress.kubernetes.io/ssl-redirect" = "443" + "alb.ingress.kubernetes.io/ssl-policy" = "ELBSecurityPolicy-TLS13-1-2-2021-06" + "alb.ingress.kubernetes.io/healthcheck-path" = "/healthz/ready" } } spec { @@ -107,6 +108,8 @@ resource "kubernetes_service_v1" "otel_example" { # see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#deployment-v1-apps # see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#podtemplatespec-v1-core # see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#container-v1-core +# see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#probe-v1-core +# see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#httpgetaction-v1-core # see https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/deployment_v1 resource "kubernetes_deployment_v1" "otel_example" { metadata { @@ -149,6 +152,12 @@ resource "kubernetes_deployment_v1" "otel_example" { name = "web" container_port = 8000 } + readiness_probe { + http_get { + path = "/healthz/ready" + port = "web" + } + } resources { requests = { cpu = "0.2"