From 1db75a70d98b4bd86cafca5ca5c173b119916e5f Mon Sep 17 00:00:00 2001 From: Jonsy13 Date: Tue, 16 Jul 2024 15:14:57 +0530 Subject: [PATCH 1/2] Added support for proxy envs Signed-off-by: Jonsy13 --- charts/litmus/README.md | 5 +++++ charts/litmus/templates/auth-server-deployment.yaml | 8 ++++++++ charts/litmus/templates/server-deployment.yaml | 8 ++++++++ charts/litmus/values.yaml | 8 ++++++++ 4 files changed, 29 insertions(+) diff --git a/charts/litmus/README.md b/charts/litmus/README.md index 90c530ba..840ffa5b 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -240,6 +240,11 @@ We separated service configuration from `portal.server.service` to `portal.serve | portal.server.waitForMongodb.resources.requests.ephemeral-storage | string | `"500Mi"` | | | portal.server.waitForMongodb.resources.requests.memory | string | `"150Mi"` | | | portal.server.waitForMongodb.securityContext | object | `{}` | | +| proxy.components[0] | string | `"auth-server"` | | +| proxy.components[1] | string | `"gql-server"` | | +| proxy.httpProxy | string | `nil` | | +| proxy.httpsProxy | string | `nil` | | +| proxy.noProxy | string | `nil` | | ---------------------------------------------- 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/auth-server-deployment.yaml b/charts/litmus/templates/auth-server-deployment.yaml index 19bb042e..891fa506 100644 --- a/charts/litmus/templates/auth-server-deployment.yaml +++ b/charts/litmus/templates/auth-server-deployment.yaml @@ -142,6 +142,14 @@ spec: value: "{{ (index .Values.portal.server.authServer.ports 1).containerPort }}" - name: ALLOWED_ORIGINS value: "{{ .Values.allowedOrigins }}" + {{- if has "auth-server" .Values.proxy.components }} + - name: HTTP_PROXY + value: "{{ .Values.proxy.httpProxy }}" + - name: HTTPS_PROXY + value: "{{ .Values.proxy.httpsProxy }}" + - name: NO_PROXY + value: "{{ .Values.proxy.noProxy }}" + {{- end }} {{- range $key, $val := .Values.portal.server.authServer.env }} - name: {{ $key }} value: {{ $val | quote }} diff --git a/charts/litmus/templates/server-deployment.yaml b/charts/litmus/templates/server-deployment.yaml index 0ec9f270..ca8f78a5 100644 --- a/charts/litmus/templates/server-deployment.yaml +++ b/charts/litmus/templates/server-deployment.yaml @@ -153,6 +153,14 @@ spec: value: "{{ (index .Values.portal.server.graphqlServer.ports 1).containerPort }}" - name: ALLOWED_ORIGINS value: "{{ .Values.allowedOrigins }}" + {{- if has "gql-server" .Values.proxy.components }} + - name: HTTP_PROXY + value: "{{ .Values.proxy.httpProxy }}" + - name: HTTPS_PROXY + value: "{{ .Values.proxy.httpsProxy }}" + - name: NO_PROXY + value: "{{ .Values.proxy.noProxy }}" + {{- end }} {{- $imageRegistry := .Values.image.imageRegistryName -}} {{- range $key, $val := .Values.portal.server.graphqlServer.imageEnv }} - name: {{ $key }} diff --git a/charts/litmus/values.yaml b/charts/litmus/values.yaml index 4a1d5a16..b8eb0a33 100644 --- a/charts/litmus/values.yaml +++ b/charts/litmus/values.yaml @@ -92,6 +92,14 @@ ingress: # - secretName: chart-example-tls # hosts: [] +proxy: + httpProxy: + httpsProxy: + noProxy: + components: + - auth-server + - gql-server + portal: frontend: replicas: 1 From f49ecfd6d937364afb9613c5b8e6cbc46fe58d99 Mon Sep 17 00:00:00 2001 From: Jonsy13 Date: Tue, 16 Jul 2024 15:18:24 +0530 Subject: [PATCH 2/2] Added support for proxy envs Signed-off-by: Jonsy13 --- charts/litmus/Chart.yaml | 2 +- charts/litmus/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/litmus/Chart.yaml b/charts/litmus/Chart.yaml index 29a49886..7d92cf6a 100644 --- a/charts/litmus/Chart.yaml +++ b/charts/litmus/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "3.9.0" description: A Helm chart to install ChaosCenter name: litmus -version: 3.9.0 +version: 3.9.1 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: diff --git a/charts/litmus/README.md b/charts/litmus/README.md index 840ffa5b..de29630d 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -1,6 +1,6 @@ # litmus -![Version: 3.9.0](https://img.shields.io/badge/Version-3.9.0-informational?style=flat-square) ![AppVersion: 3.9.0](https://img.shields.io/badge/AppVersion-3.9.0-informational?style=flat-square) +![Version: 3.9.1](https://img.shields.io/badge/Version-3.9.1-informational?style=flat-square) ![AppVersion: 3.9.0](https://img.shields.io/badge/AppVersion-3.9.0-informational?style=flat-square) A Helm chart to install ChaosCenter