From 3a3b9151e8f2a96774b7691d7431fec5bdd92ecf Mon Sep 17 00:00:00 2001 From: Jonsy13 Date: Thu, 4 Apr 2024 12:59:14 +0530 Subject: [PATCH 1/2] Added changes for ingress & upgrade agent removal Signed-off-by: Jonsy13 --- charts/litmus/Chart.yaml | 2 +- charts/litmus/README.md | 2 +- charts/litmus/templates/ingress.yaml | 8 +- .../litmus/templates/post-upgrade-hook.yaml | 80 ------------------- 4 files changed, 6 insertions(+), 86 deletions(-) delete mode 100644 charts/litmus/templates/post-upgrade-hook.yaml diff --git a/charts/litmus/Chart.yaml b/charts/litmus/Chart.yaml index cb8b7b7b..5cae4309 100644 --- a/charts/litmus/Chart.yaml +++ b/charts/litmus/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "3.1.0" +appVersion: "3.1.1" description: A Helm chart to install ChaosCenter name: litmus version: 3.1.0 diff --git a/charts/litmus/README.md b/charts/litmus/README.md index 94312df7..8fa56f1e 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -1,6 +1,6 @@ # litmus -![Version: 3.1.0](https://img.shields.io/badge/Version-3.1.0-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square) +![Version: 3.1.0](https://img.shields.io/badge/Version-3.1.0-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.1-informational?style=flat-square) A Helm chart to install ChaosCenter diff --git a/charts/litmus/templates/ingress.yaml b/charts/litmus/templates/ingress.yaml index 280c4cbb..816b6f75 100644 --- a/charts/litmus/templates/ingress.yaml +++ b/charts/litmus/templates/ingress.yaml @@ -47,22 +47,22 @@ spec: service: name: {{ $fullName }}-frontend-service port: - number: 9091 + number: {{ .Values.portal.frontend.service.port }} - path: {{ .Values.ingress.host.backend.path }} pathType: {{ .Values.ingress.host.backend.pathType }} backend: service: name: {{ $fullName }}-server-service port: - number: 9002 + number: {{ .Values.portal.server.graphqlServer.service.graphqlServer.port }} {{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion }} - path: {{ .Values.ingress.host.paths.frontend }} backend: serviceName: {{ $fullName }}-frontend-service - servicePort: 9091 + servicePort: {{ .Values.portal.frontend.service.port }} - path: {{ .Values.ingress.host.paths.backend }} backend: serviceName: {{ $fullName }}-server-service - servicePort: 9002 + servicePort: {{ .Values.portal.server.graphqlServer.service.graphqlServer.port }} {{- end }} {{- end }} diff --git a/charts/litmus/templates/post-upgrade-hook.yaml b/charts/litmus/templates/post-upgrade-hook.yaml deleted file mode 100644 index b9c41ce5..00000000 --- a/charts/litmus/templates/post-upgrade-hook.yaml +++ /dev/null @@ -1,80 +0,0 @@ -{{- if .Values.upgradeAgent.enabled }} -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ include "litmus-portal.fullname" . }}-upgrade-agent-cp-{{.Release.Revision}} - labels: - app.kubernetes.io/managed-by: {{ .Release.Service | quote }} - app.kubernetes.io/instance: {{ .Release.Name | quote }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": post-upgrade - "helm.sh/hook-delete-policy": hook-succeeded -spec: - backoffLimit: 2 - ttlSecondsAfterFinished: 60 - template: - metadata: - labels: - app.kubernetes.io/managed-by: {{ .Release.Service | quote }} - app.kubernetes.io/instance: {{ .Release.Name | quote }} - helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - spec: - restartPolicy: {{ .Values.upgradeAgent.controlPlane.restartPolicy }} - {{- if .Values.image.imagePullSecrets }} - imagePullSecrets: - {{ toYaml .Values.image.imagePullSecrets | nindent 8 }} - {{- end }} - containers: - - name: upgrade-agent - image: {{ .Values.image.imageRegistryName }}/{{ .Values.upgradeAgent.controlPlane.image.repository }}:{{ .Values.upgradeAgent.controlPlane.image.tag }} - imagePullPolicy: {{ .Values.upgradeAgent.controlPlane.image.pullPolicy }} - envFrom: - - secretRef: - name: {{ include "litmus-portal.secretname" . }} - - configMapRef: - name: {{ include "litmus-portal.fullname" . }}-admin-config - env: - - name: DB_PASSWORD - {{- if .Values.mongodb.enabled }} - {{- if not .Values.mongodb.auth.existingSecret }} - value: {{ .Values.mongodb.auth.rootPassword }} - {{- else }} - valueFrom: - secretKeyRef: - name: {{ .Values.mongodb.auth.existingSecret }} - key: mongodb-root-password - {{- end }} - {{- else }} - valueFrom: - secretKeyRef: - name: {{ include "litmus-portal.secretname" . }} - key: DB_PASSWORD - {{- end }} - - name: DB_USER - {{- if .Values.mongodb.enabled }} - value: {{ .Values.mongodb.auth.rootUser }} - {{- else }} - valueFrom: - secretKeyRef: - name: {{ include "litmus-portal.secretname" . }} - key: DB_USER - {{- end }} - resources: - {{- toYaml .Values.upgradeAgent.resources | nindent 12 }} - {{- with .Values.upgradeAgent.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.upgradeAgent.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.upgradeAgent.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} From 1799e6d0393757c777bce3b7248176f8d8dfea29 Mon Sep 17 00:00:00 2001 From: Jonsy13 Date: Thu, 4 Apr 2024 13:08:05 +0530 Subject: [PATCH 2/2] Added changes for ingress & upgrade agent removal Signed-off-by: Jonsy13 --- charts/litmus/Chart.yaml | 4 ++-- charts/litmus/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/litmus/Chart.yaml b/charts/litmus/Chart.yaml index 5cae4309..84983af2 100644 --- a/charts/litmus/Chart.yaml +++ b/charts/litmus/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "3.1.1" +appVersion: "3.1.0" description: A Helm chart to install ChaosCenter name: litmus -version: 3.1.0 +version: 3.1.1 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: diff --git a/charts/litmus/README.md b/charts/litmus/README.md index 8fa56f1e..8516b64e 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -1,6 +1,6 @@ # litmus -![Version: 3.1.0](https://img.shields.io/badge/Version-3.1.0-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.1-informational?style=flat-square) +![Version: 3.1.1](https://img.shields.io/badge/Version-3.1.1-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square) A Helm chart to install ChaosCenter