From 7220cad121691c03dec0c26f1b83e78a36ec6a18 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Thu, 30 May 2024 10:33:50 +0200 Subject: [PATCH] fix: tweak dapr annotations and limits --- charts/archmeister/base/deployment_patch.yaml | 18 ++++++++++++++++++ charts/archmeister/prod/deployment_patch.yaml | 7 ------- .../archmeister/staging/deployment_patch.yaml | 7 ------- charts/atlantis/base/deployment_patch.yaml | 18 ++++++++++++++++++ charts/atlantis/prod/deployment_patch.yaml | 7 ------- charts/atlantis/staging/deployment_patch.yaml | 7 ------- charts/hipster/base/deployment_patch.yaml | 18 ++++++++++++++++++ charts/hipster/prod/deployment_patch.yaml | 8 -------- charts/hipster/staging/deployment_patch.yaml | 8 -------- charts/petimeter/base/deployment_patch.yaml | 18 ++++++++++++++++++ charts/petimeter/prod/deployment_patch.yaml | 7 ------- charts/petimeter/staging/deployment_patch.yaml | 7 ------- 12 files changed, 72 insertions(+), 58 deletions(-) diff --git a/charts/archmeister/base/deployment_patch.yaml b/charts/archmeister/base/deployment_patch.yaml index c8368399..759b833c 100644 --- a/charts/archmeister/base/deployment_patch.yaml +++ b/charts/archmeister/base/deployment_patch.yaml @@ -1,3 +1,21 @@ +- op: add + path: /spec/template/metadata/annotations + value: + dapr.io/enabled: "true" + dapr.io/app-id: "archmeister" + dapr.io/app-port: "8000" + dapr.io/config: "tracing" + dapr.io/app-protocol: "http" + dapr.io/enable-app-health-check: "true" + dapr.io/app-health-check-path: "/healthz" + dapr.io/app-health-probe-interval: "3" + dapr.io/app-health-probe-timeout: "200" + dapr.io/app-health-threshold: "2" + dapr.io/sidecar-cpu-request: "100m" + dapr.io/sidecar-memory-request: "250Mi" + dapr.io/sidecar-cpu-limit: "300m" + dapr.io/sidecar-memory-limit: "1000Mi" + dapr.io/log-as-json: "true" - op: replace path: /spec/template/spec/containers/0/livenessProbe/httpGet/path value: /healthz diff --git a/charts/archmeister/prod/deployment_patch.yaml b/charts/archmeister/prod/deployment_patch.yaml index ff2a702a..1e899e2d 100644 --- a/charts/archmeister/prod/deployment_patch.yaml +++ b/charts/archmeister/prod/deployment_patch.yaml @@ -1,10 +1,3 @@ -- op: add - path: /spec/template/metadata/annotations - value: - dapr.io/enabled: "true" - dapr.io/app-id: "archmeister" - dapr.io/app-port: "8000" - dapr.io/config: "tracing" - op: add path: /spec/template/spec/containers/0/env/- value: diff --git a/charts/archmeister/staging/deployment_patch.yaml b/charts/archmeister/staging/deployment_patch.yaml index 9f926e38..fd4f0400 100644 --- a/charts/archmeister/staging/deployment_patch.yaml +++ b/charts/archmeister/staging/deployment_patch.yaml @@ -1,10 +1,3 @@ -- op: add - path: /spec/template/metadata/annotations - value: - dapr.io/enabled: "true" - dapr.io/app-id: "archmeister" - dapr.io/app-port: "8000" - dapr.io/config: "tracing" - op: replace path: /spec/template/spec/containers/0/env/0 value: diff --git a/charts/atlantis/base/deployment_patch.yaml b/charts/atlantis/base/deployment_patch.yaml index 546c88e9..c4641cde 100644 --- a/charts/atlantis/base/deployment_patch.yaml +++ b/charts/atlantis/base/deployment_patch.yaml @@ -1,3 +1,21 @@ +- op: add + path: /spec/template/metadata/annotations + value: + dapr.io/enabled: "true" + dapr.io/app-id: "atlantis" + dapr.io/app-port: "8000" + dapr.io/config: "tracing" + dapr.io/app-protocol: "http" + dapr.io/enable-app-health-check: "true" + dapr.io/app-health-check-path: "/healthz" + dapr.io/app-health-probe-interval: "3" + dapr.io/app-health-probe-timeout: "200" + dapr.io/app-health-threshold: "2" + dapr.io/sidecar-cpu-request: "100m" + dapr.io/sidecar-memory-request: "250Mi" + dapr.io/sidecar-cpu-limit: "300m" + dapr.io/sidecar-memory-limit: "1000Mi" + dapr.io/log-as-json: "true" - op: replace path: /spec/template/spec/containers/0/livenessProbe/httpGet/path value: /healthz diff --git a/charts/atlantis/prod/deployment_patch.yaml b/charts/atlantis/prod/deployment_patch.yaml index 2cf4976b..20410b3d 100644 --- a/charts/atlantis/prod/deployment_patch.yaml +++ b/charts/atlantis/prod/deployment_patch.yaml @@ -1,10 +1,3 @@ -- op: add - path: /spec/template/metadata/annotations - value: - dapr.io/enabled: "true" - dapr.io/app-id: "atlantis" - dapr.io/app-port: "8000" - dapr.io/config: "tracing" - op: replace path: /spec/template/spec/containers/0/env/0 value: diff --git a/charts/atlantis/staging/deployment_patch.yaml b/charts/atlantis/staging/deployment_patch.yaml index 530f8bcf..278de3ae 100644 --- a/charts/atlantis/staging/deployment_patch.yaml +++ b/charts/atlantis/staging/deployment_patch.yaml @@ -1,10 +1,3 @@ -- op: add - path: /spec/template/metadata/annotations - value: - dapr.io/enabled: "true" - dapr.io/app-id: "atlantis" - dapr.io/app-port: "8000" - dapr.io/config: "tracing" - op: replace path: /spec/template/spec/containers/0/env/0 value: diff --git a/charts/hipster/base/deployment_patch.yaml b/charts/hipster/base/deployment_patch.yaml index c8368399..d9bad0ee 100644 --- a/charts/hipster/base/deployment_patch.yaml +++ b/charts/hipster/base/deployment_patch.yaml @@ -1,3 +1,21 @@ +- op: add + path: /spec/template/metadata/annotations + value: + dapr.io/enabled: "true" + dapr.io/app-id: "hipster" + dapr.io/app-port: "8000" + dapr.io/config: "tracing" + dapr.io/app-protocol: "http" + dapr.io/enable-app-health-check: "true" + dapr.io/app-health-check-path: "/healthz" + dapr.io/app-health-probe-interval: "3" + dapr.io/app-health-probe-timeout: "200" + dapr.io/app-health-threshold: "2" + dapr.io/sidecar-cpu-request: "100m" + dapr.io/sidecar-memory-request: "250Mi" + dapr.io/sidecar-cpu-limit: "300m" + dapr.io/sidecar-memory-limit: "1000Mi" + dapr.io/log-as-json: "true" - op: replace path: /spec/template/spec/containers/0/livenessProbe/httpGet/path value: /healthz diff --git a/charts/hipster/prod/deployment_patch.yaml b/charts/hipster/prod/deployment_patch.yaml index 1a13330c..951f7d23 100644 --- a/charts/hipster/prod/deployment_patch.yaml +++ b/charts/hipster/prod/deployment_patch.yaml @@ -1,11 +1,3 @@ -- op: add - path: /spec/template/metadata/annotations - value: - dapr.io/enabled: "true" - dapr.io/app-id: "hipster" - dapr.io/app-id: "hipster" - dapr.io/app-port: "8000" - dapr.io/config: "tracing" - op: add path: /spec/template/spec/containers/0/env value: [] diff --git a/charts/hipster/staging/deployment_patch.yaml b/charts/hipster/staging/deployment_patch.yaml index 7b9603ba..d57f4179 100644 --- a/charts/hipster/staging/deployment_patch.yaml +++ b/charts/hipster/staging/deployment_patch.yaml @@ -1,11 +1,3 @@ -- op: add - path: /spec/template/metadata/annotations - value: - dapr.io/enabled: "true" - dapr.io/app-id: "hipster" - dapr.io/app-id: "hipster" - dapr.io/app-port: "8000" - dapr.io/config: "tracing" - op: add path: /spec/template/spec/containers/0/env value: [] diff --git a/charts/petimeter/base/deployment_patch.yaml b/charts/petimeter/base/deployment_patch.yaml index 4730e743..02dc45e2 100644 --- a/charts/petimeter/base/deployment_patch.yaml +++ b/charts/petimeter/base/deployment_patch.yaml @@ -1,3 +1,21 @@ +- op: add + path: /spec/template/metadata/annotations + value: + dapr.io/enabled: "true" + dapr.io/app-id: "petimeter" + dapr.io/app-port: "8000" + dapr.io/config: "tracing" + dapr.io/app-protocol: "http" + dapr.io/enable-app-health-check: "true" + dapr.io/app-health-check-path: "/healthz" + dapr.io/app-health-probe-interval: "3" + dapr.io/app-health-probe-timeout: "200" + dapr.io/app-health-threshold: "2" + dapr.io/sidecar-cpu-request: "100m" + dapr.io/sidecar-memory-request: "250Mi" + dapr.io/sidecar-cpu-limit: "300m" + dapr.io/sidecar-memory-limit: "1000Mi" + dapr.io/log-as-json: "true" - op: replace path: /spec/template/spec/containers/0/livenessProbe/httpGet/path value: /healthz diff --git a/charts/petimeter/prod/deployment_patch.yaml b/charts/petimeter/prod/deployment_patch.yaml index 96bb84dd..77d1f475 100644 --- a/charts/petimeter/prod/deployment_patch.yaml +++ b/charts/petimeter/prod/deployment_patch.yaml @@ -1,10 +1,3 @@ -- op: add - path: /spec/template/metadata/annotations - value: - dapr.io/enabled: "true" - dapr.io/app-id: "petimeter" - dapr.io/app-port: "8000" - dapr.io/config: "tracing" - op: replace path: /spec/template/spec/containers/0/env/0 value: diff --git a/charts/petimeter/staging/deployment_patch.yaml b/charts/petimeter/staging/deployment_patch.yaml index 4db3c90c..192dc380 100644 --- a/charts/petimeter/staging/deployment_patch.yaml +++ b/charts/petimeter/staging/deployment_patch.yaml @@ -1,10 +1,3 @@ -- op: add - path: /spec/template/metadata/annotations - value: - dapr.io/enabled: "true" - dapr.io/app-id: "petimeter" - dapr.io/app-port: "8000" - dapr.io/config: "tracing" - op: replace path: /spec/template/spec/containers/0/env/0 value: