From 6399b1d979885a033f3c2985790bf5278997019c Mon Sep 17 00:00:00 2001 From: Jose Plascencia Date: Sun, 7 Apr 2024 18:41:47 -0400 Subject: [PATCH] refactor(litmus): adding "ns.svc.cluster.local" to urls Adding full service fqdn to the end of service urls to assist with proxied environments Signed-off-by: Jose Plascencia --- charts/litmus/Chart.yaml | 2 +- charts/litmus/README.md | 4 +--- charts/litmus/templates/_helpers.tpl | 2 +- charts/litmus/templates/controlplane-configs.yaml | 6 +++--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/charts/litmus/Chart.yaml b/charts/litmus/Chart.yaml index 88130b74..d36610ca 100644 --- a/charts/litmus/Chart.yaml +++ b/charts/litmus/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "3.5.0" description: A Helm chart to install ChaosCenter name: litmus -version: 3.5.1 +version: 3.5.2 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: diff --git a/charts/litmus/README.md b/charts/litmus/README.md index b8cb1d51..83e00932 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -1,6 +1,6 @@ # litmus -![Version: 3.5.1](https://img.shields.io/badge/Version-3.5.1-informational?style=flat-square) ![AppVersion: 3.5.0](https://img.shields.io/badge/AppVersion-3.5.0-informational?style=flat-square) +![Version: 3.5.2](https://img.shields.io/badge/Version-3.5.2-informational?style=flat-square) ![AppVersion: 3.5.0](https://img.shields.io/badge/AppVersion-3.5.0-informational?style=flat-square) A Helm chart to install ChaosCenter @@ -237,5 +237,3 @@ We separated service configuration from `portal.server.service` to `portal.serve | upgradeAgent.resources | object | `{}` | | | upgradeAgent.tolerations | list | `[]` | | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/litmus/templates/_helpers.tpl b/charts/litmus/templates/_helpers.tpl index d5490fb5..17ac8a92 100644 --- a/charts/litmus/templates/_helpers.tpl +++ b/charts/litmus/templates/_helpers.tpl @@ -85,7 +85,7 @@ Check for existing secret {{- $hosts := "" -}} {{- $count := (.Values.mongodb.replicaCount | int) -}} {{- range $i, $e := until $count -}} - {{- $host := printf "%s-mongodb-%d.%s-mongodb-headless" $.Release.Name $i $.Release.Name -}} + {{- $host := printf "%s-mongodb-%d.%s-mongodb-headless.%s.svc.cluster.local" $.Release.Name $i $.Release.Name $.Release.Namespace -}} {{- $hosts = printf "%s%s:%d," $hosts $host 27017 -}} {{- end -}} mongodb://{{ trimSuffix "," $hosts }}/admin diff --git a/charts/litmus/templates/controlplane-configs.yaml b/charts/litmus/templates/controlplane-configs.yaml index 0182aabb..dfe8ae7c 100644 --- a/charts/litmus/templates/controlplane-configs.yaml +++ b/charts/litmus/templates/controlplane-configs.yaml @@ -88,7 +88,7 @@ data: proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass "http://{{ include "litmus-portal.fullname" . }}-auth-server-service:9003/"; + proxy_pass "http://{{ include "litmus-portal.fullname" . }}-auth-server-service.{{ .Release.Namespace }}.svc.cluster.local:9003/"; } location /api/ { @@ -97,7 +97,7 @@ data: proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass "http://{{ include "litmus-portal.fullname" . }}-server-service:9002/"; + proxy_pass "http://{{ include "litmus-portal.fullname" . }}-server-service.{{ .Release.Namespace }}.svc.cluster.local:9002/"; } location /ws/ { @@ -108,7 +108,7 @@ data: proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass "http://{{ include "litmus-portal.fullname" . }}-server-service:9002/"; + proxy_pass "http://{{ include "litmus-portal.fullname" . }}-server-service.{{ .Release.Namespace }}.svc.cluster.local:9002/"; } } }