From 1f3ed07c9f46d2e63f85bad9c08d163374d4674c Mon Sep 17 00:00:00 2001 From: Jasstkn Date: Mon, 1 Aug 2022 17:52:43 +0200 Subject: [PATCH 1/5] Respect service type and make clusterIP default Signed-off-by: Jasstkn --- charts/litmus/Chart.yaml | 2 +- charts/litmus/README.md | 2 +- charts/litmus/templates/frontend-svc.yaml | 4 ---- charts/litmus/values.yaml | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/charts/litmus/Chart.yaml b/charts/litmus/Chart.yaml index 4379c41a..4f41f36d 100644 --- a/charts/litmus/Chart.yaml +++ b/charts/litmus/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.12.0" description: A Helm chart to install ChaosCenter name: litmus -version: 2.13.0 +version: 2.13.1 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: diff --git a/charts/litmus/README.md b/charts/litmus/README.md index f07496dc..4c42c5a8 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -1,6 +1,6 @@ # litmus -![Version: 2.13.0](https://img.shields.io/badge/Version-2.13.0-informational?style=flat-square) ![AppVersion: 2.12.0](https://img.shields.io/badge/AppVersion-2.12.0-informational?style=flat-square) +![Version: 2.13.1](https://img.shields.io/badge/Version-2.13.1-informational?style=flat-square) ![AppVersion: 2.12.0](https://img.shields.io/badge/AppVersion-2.12.0-informational?style=flat-square) A Helm chart to install ChaosCenter diff --git a/charts/litmus/templates/frontend-svc.yaml b/charts/litmus/templates/frontend-svc.yaml index 7871f319..5d54cb37 100644 --- a/charts/litmus/templates/frontend-svc.yaml +++ b/charts/litmus/templates/frontend-svc.yaml @@ -11,11 +11,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if or (.Values.ingress.enabled) (.Values.openshift.route.enabled) }} - type: ClusterIP - {{- else }} type: {{ .Values.portal.frontend.service.type }} - {{- end }} ports: - name: http port: {{ .Values.portal.frontend.service.port }} diff --git a/charts/litmus/values.yaml b/charts/litmus/values.yaml index c162fa10..9ccc2422 100644 --- a/charts/litmus/values.yaml +++ b/charts/litmus/values.yaml @@ -102,7 +102,7 @@ portal: customLabels: {} # my.company.com/tier: "frontend" - resources: + resources: # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following From d6b79cf752359d4e694cc6c692ee8d8cdde82855 Mon Sep 17 00:00:00 2001 From: Jasstkn Date: Tue, 2 Aug 2022 17:27:01 +0200 Subject: [PATCH 2/5] Make ClusterIP as a default & configurable for auth & graphql servers Signed-off-by: Jasstkn --- charts/litmus/README.md | 18 ++++++++++ charts/litmus/templates/auth-server-svc.yaml | 16 ++++----- charts/litmus/templates/server-svc.yaml | 16 ++++----- charts/litmus/values.yaml | 35 +++++++++++--------- 4 files changed, 49 insertions(+), 36 deletions(-) diff --git a/charts/litmus/README.md b/charts/litmus/README.md index 4c42c5a8..4f0a732b 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -124,8 +124,17 @@ $ helm install litmus-portal litmuschaos/litmus | portal.server.authServer.securityContext.readOnlyRootFilesystem | bool | `true` | | | portal.server.authServer.securityContext.runAsNonRoot | bool | `true` | | | portal.server.authServer.securityContext.runAsUser | int | `2000` | | +<<<<<<< HEAD | portal.server.authServer.volumeMounts | list | `[]` | | | portal.server.authServer.volumes | list | `[]` | | +======= +| portal.server.authServer.service.annotations | object | `{}` | | +| portal.server.authServer.service.authRpcServer.port | int | `3030` | | +| portal.server.authServer.service.authRpcServer.targetPort | int | `3030` | | +| portal.server.authServer.service.authServer.port | int | `9003` | | +| portal.server.authServer.service.authServer.targetPort | int | `3000` | | +| portal.server.authServer.service.type | string | `"ClusterIP"` | | +>>>>>>> 037c8cf (Make ClusterIP as a default & configurable for auth & graphql servers) | portal.server.customLabels | object | `{}` | | | portal.server.graphqlServer.genericEnv.AGENT_DEPLOYMENTS | string | `"[\"app=chaos-exporter\", \"name=chaos-operator\", \"app=event-tracker\", \"app=workflow-controller\"]"` | | | portal.server.graphqlServer.genericEnv.CHAOS_CENTER_UI_ENDPOINT | string | `""` | | @@ -172,6 +181,12 @@ $ helm install litmus-portal litmuschaos/litmus | portal.server.graphqlServer.securityContext.readOnlyRootFilesystem | bool | `true` | | | portal.server.graphqlServer.securityContext.runAsNonRoot | bool | `true` | | | portal.server.graphqlServer.securityContext.runAsUser | int | `2000` | | +| portal.server.graphqlServer.service.annotations | object | `{}` | | +| portal.server.graphqlServer.service.graphqlRpcServer.port | int | `8000` | | +| portal.server.graphqlServer.service.graphqlRpcServer.targetPort | int | `8000` | | +| portal.server.graphqlServer.service.graphqlServer.port | int | `9002` | | +| portal.server.graphqlServer.service.graphqlServer.targetPort | int | `8080` | | +| portal.server.graphqlServer.service.type | string | `"ClusterIP"` | | | portal.server.graphqlServer.volumeMounts[0].mountPath | string | `"/tmp/"` | | | portal.server.graphqlServer.volumeMounts[0].name | string | `"gitops-storage"` | | | portal.server.graphqlServer.volumeMounts[1].mountPath | string | `"/tmp/version"` | | @@ -182,6 +197,7 @@ $ helm install litmus-portal litmuschaos/litmus | portal.server.graphqlServer.volumes[1].name | string | `"hub-storage"` | | | portal.server.nodeSelector | object | `{}` | | | portal.server.replicas | int | `1` | | +<<<<<<< HEAD | portal.server.service.annotations | object | `{}` | | | portal.server.service.authRpcServer.port | int | `3030` | | | portal.server.service.authRpcServer.targetPort | int | `3030` | | @@ -192,6 +208,8 @@ $ helm install litmus-portal litmuschaos/litmus | portal.server.service.graphqlServer.port | int | `9002` | | | portal.server.service.graphqlServer.targetPort | int | `8080` | | | portal.server.service.type | string | `"ClusterIP"` | | +======= +>>>>>>> 037c8cf (Make ClusterIP as a default & configurable for auth & graphql servers) | portal.server.serviceAccountName | string | `"litmus-server-account"` | | | portal.server.tolerations | list | `[]` | | | portal.server.updateStrategy | object | `{}` | | diff --git a/charts/litmus/templates/auth-server-svc.yaml b/charts/litmus/templates/auth-server-svc.yaml index eb747441..6c6b16a6 100644 --- a/charts/litmus/templates/auth-server-svc.yaml +++ b/charts/litmus/templates/auth-server-svc.yaml @@ -6,22 +6,18 @@ metadata: labels: app.kubernetes.io/component: {{ include "litmus-portal.name" . }}-auth-server {{- include "litmus-portal.labels" . | nindent 4 }} - {{- with .Values.portal.server.service.annotations }} + {{- with .Values.portal.server.authServer.service.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if .Values.ingress.enabled }} - type: ClusterIP - {{- else }} - type: {{ .Values.portal.server.service.type }} - {{- end }} + type: {{ .Values.portal.server.authServer.service.type }} ports: - name: auth-server - port: {{ .Values.portal.server.service.authServer.port }} - targetPort: {{ .Values.portal.server.service.authServer.targetPort }} + port: {{ .Values.portal.server.authServer.service.authServer.port }} + targetPort: {{ .Values.portal.server.authServer.service.authServer.targetPort }} - name: auth-rpc-server - port: {{ .Values.portal.server.service.authRpcServer.port }} - targetPort: {{ .Values.portal.server.service.authRpcServer.targetPort }} + port: {{ .Values.portal.server.authServer.service.authRpcServer.port }} + targetPort: {{ .Values.portal.server.authServer.service.authRpcServer.targetPort }} selector: app.kubernetes.io/component: {{ include "litmus-portal.name" . }}-auth-server diff --git a/charts/litmus/templates/server-svc.yaml b/charts/litmus/templates/server-svc.yaml index 430699ce..ead31fec 100644 --- a/charts/litmus/templates/server-svc.yaml +++ b/charts/litmus/templates/server-svc.yaml @@ -6,22 +6,18 @@ metadata: labels: app.kubernetes.io/component: {{ include "litmus-portal.name" . }}-server {{- include "litmus-portal.labels" . | nindent 4 }} - {{- with .Values.portal.server.service.annotations }} + {{- with .Values.portal.server.graphqlServer.service.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if .Values.ingress.enabled }} - type: ClusterIP - {{- else }} - type: {{ .Values.portal.server.service.type }} - {{- end }} + type: {{ .Values.portal.server.graphqlServer.service.type }} ports: - name: graphql-server - port: {{ .Values.portal.server.service.graphqlServer.port }} - targetPort: {{ .Values.portal.server.service.graphqlServer.targetPort }} + port: {{ .Values.portal.server.graphqlServer.service.graphqlServer.port }} + targetPort: {{ .Values.portal.server.graphqlServer.service.graphqlServer.targetPort }} - name: graphql-rpc-server - port: {{ .Values.portal.server.service.graphqlRpcServer.port }} - targetPort: {{ .Values.portal.server.service.graphqlRpcServer.targetPort }} + port: {{ .Values.portal.server.graphqlServer.service.graphqlRpcServer.port }} + targetPort: {{ .Values.portal.server.graphqlServer.service.graphqlRpcServer.targetPort }} selector: app.kubernetes.io/component: {{ include "litmus-portal.name" . }}-server diff --git a/charts/litmus/values.yaml b/charts/litmus/values.yaml index 9ccc2422..a5c7f47b 100644 --- a/charts/litmus/values.yaml +++ b/charts/litmus/values.yaml @@ -198,6 +198,15 @@ portal: containerPort: 8080 - name: gql-rpc-server containerPort: 8000 + service: + annotations: {} + type: ClusterIP + graphqlServer: + port: 9002 + targetPort: 8080 + graphqlRpcServer: + port: 8000 + targetPort: 8000 imageEnv: SUBSCRIBER_IMAGE: "litmusportal-subscriber:2.12.0" EVENT_TRACKER_IMAGE: "litmusportal-event-tracker:2.12.0" @@ -260,6 +269,15 @@ portal: containerPort: 3030 - name: auth-rpc-server containerPort: 3000 + service: + annotations: {} + type: ClusterIP + authServer: + port: 9003 + targetPort: 3000 + authRpcServer: + port: 3030 + targetPort: 3030 env: LITMUS_GQL_GRPC_PORT: ":8000" resources: @@ -277,22 +295,7 @@ portal: ephemeral-storage: "1Gi" volumeMounts: [] volumes: [] - - service: - annotations: {} - type: ClusterIP - graphqlServer: - port: 9002 - targetPort: 8080 - graphqlRpcServer: - port: 8000 - targetPort: 8000 - authServer: - port: 9003 - targetPort: 3000 - authRpcServer: - port: 3030 - targetPort: 3030 + nodeSelector: {} tolerations: [] affinity: {} From 64616e8060dd9352c693c125998adc702c02251f Mon Sep 17 00:00:00 2001 From: Jasstkn Date: Tue, 9 Aug 2022 20:06:07 +0200 Subject: [PATCH 3/5] delete redundant values, bump chart Signed-off-by: Jasstkn --- charts/litmus-core/Chart.yaml | 2 +- charts/litmus-core/README.md | 2 +- charts/litmus/README.md | 26 ++++++++------------------ charts/litmus/README.md.gotmpl | 6 ++++++ 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/charts/litmus-core/Chart.yaml b/charts/litmus-core/Chart.yaml index 66f17658..a4de3032 100644 --- a/charts/litmus-core/Chart.yaml +++ b/charts/litmus-core/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "2.11.0" description: A Helm chart to install litmus infra components on Kubernetes name: litmus-core -version: 2.11.0 +version: 2.12.0 home: https://litmuschaos.io sources: - https://github.com/litmuschaos/litmus diff --git a/charts/litmus-core/README.md b/charts/litmus-core/README.md index c6461239..ab5cf1cb 100644 --- a/charts/litmus-core/README.md +++ b/charts/litmus-core/README.md @@ -1,6 +1,6 @@ # litmus-core -![Version: 2.11.0](https://img.shields.io/badge/Version-2.11.0-informational?style=flat-square) ![AppVersion: 2.11.0](https://img.shields.io/badge/AppVersion-2.11.0-informational?style=flat-square) +![Version: 2.12.0](https://img.shields.io/badge/Version-2.12.0-informational?style=flat-square) ![AppVersion: 2.11.0](https://img.shields.io/badge/AppVersion-2.11.0-informational?style=flat-square) A Helm chart to install litmus infra components on Kubernetes diff --git a/charts/litmus/README.md b/charts/litmus/README.md index 4f0a732b..1d29d23a 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -35,6 +35,12 @@ $ helm repo add litmuschaos https://litmuschaos.github.io/litmus-helm/ $ helm install litmus-portal litmuschaos/litmus ``` +## Upgrading Chart + +### From 2.12.X -> 2.13.X + +We separated service configuration from `portal.server.service` to `portal.server.graphqlServer.service` and `portal.server.authServer.service`. You need to move your values to the correspondent options and upgrade as usual. + ## Values | Key | Type | Default | Description | @@ -124,17 +130,14 @@ $ helm install litmus-portal litmuschaos/litmus | portal.server.authServer.securityContext.readOnlyRootFilesystem | bool | `true` | | | portal.server.authServer.securityContext.runAsNonRoot | bool | `true` | | | portal.server.authServer.securityContext.runAsUser | int | `2000` | | -<<<<<<< HEAD -| portal.server.authServer.volumeMounts | list | `[]` | | -| portal.server.authServer.volumes | list | `[]` | | -======= | portal.server.authServer.service.annotations | object | `{}` | | | portal.server.authServer.service.authRpcServer.port | int | `3030` | | | portal.server.authServer.service.authRpcServer.targetPort | int | `3030` | | | portal.server.authServer.service.authServer.port | int | `9003` | | | portal.server.authServer.service.authServer.targetPort | int | `3000` | | | portal.server.authServer.service.type | string | `"ClusterIP"` | | ->>>>>>> 037c8cf (Make ClusterIP as a default & configurable for auth & graphql servers) +| portal.server.authServer.volumeMounts | list | `[]` | | +| portal.server.authServer.volumes | list | `[]` | | | portal.server.customLabels | object | `{}` | | | portal.server.graphqlServer.genericEnv.AGENT_DEPLOYMENTS | string | `"[\"app=chaos-exporter\", \"name=chaos-operator\", \"app=event-tracker\", \"app=workflow-controller\"]"` | | | portal.server.graphqlServer.genericEnv.CHAOS_CENTER_UI_ENDPOINT | string | `""` | | @@ -197,19 +200,6 @@ $ helm install litmus-portal litmuschaos/litmus | portal.server.graphqlServer.volumes[1].name | string | `"hub-storage"` | | | portal.server.nodeSelector | object | `{}` | | | portal.server.replicas | int | `1` | | -<<<<<<< HEAD -| portal.server.service.annotations | object | `{}` | | -| portal.server.service.authRpcServer.port | int | `3030` | | -| portal.server.service.authRpcServer.targetPort | int | `3030` | | -| portal.server.service.authServer.port | int | `9003` | | -| portal.server.service.authServer.targetPort | int | `3000` | | -| portal.server.service.graphqlRpcServer.port | int | `8000` | | -| portal.server.service.graphqlRpcServer.targetPort | int | `8000` | | -| portal.server.service.graphqlServer.port | int | `9002` | | -| portal.server.service.graphqlServer.targetPort | int | `8080` | | -| portal.server.service.type | string | `"ClusterIP"` | | -======= ->>>>>>> 037c8cf (Make ClusterIP as a default & configurable for auth & graphql servers) | portal.server.serviceAccountName | string | `"litmus-server-account"` | | | portal.server.tolerations | list | `[]` | | | portal.server.updateStrategy | object | `{}` | | diff --git a/charts/litmus/README.md.gotmpl b/charts/litmus/README.md.gotmpl index 96ff472c..42046559 100644 --- a/charts/litmus/README.md.gotmpl +++ b/charts/litmus/README.md.gotmpl @@ -21,6 +21,12 @@ $ helm repo add litmuschaos https://litmuschaos.github.io/litmus-helm/ $ helm install litmus-portal litmuschaos/litmus ``` +## Upgrading Chart + +### From 2.12.X -> 2.13.X + +We separated service configuration from `portal.server.service` to `portal.server.graphqlServer.service` and `portal.server.authServer.service`. You need to move your values to the correspondent options and upgrade as usual. + {{ template "chart.valuesSection" . }} {{ template "helm-docs.versionFooter" . }} From 476bfbe78845ef0d71b8d66bc6f213e94d201f15 Mon Sep 17 00:00:00 2001 From: Jasstkn Date: Tue, 9 Aug 2022 20:57:48 +0200 Subject: [PATCH 4/5] revert bump for litmus-core Signed-off-by: Jasstkn --- charts/litmus-core/Chart.yaml | 2 +- charts/litmus-core/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/litmus-core/Chart.yaml b/charts/litmus-core/Chart.yaml index a4de3032..66f17658 100644 --- a/charts/litmus-core/Chart.yaml +++ b/charts/litmus-core/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "2.11.0" description: A Helm chart to install litmus infra components on Kubernetes name: litmus-core -version: 2.12.0 +version: 2.11.0 home: https://litmuschaos.io sources: - https://github.com/litmuschaos/litmus diff --git a/charts/litmus-core/README.md b/charts/litmus-core/README.md index ab5cf1cb..c6461239 100644 --- a/charts/litmus-core/README.md +++ b/charts/litmus-core/README.md @@ -1,6 +1,6 @@ # litmus-core -![Version: 2.12.0](https://img.shields.io/badge/Version-2.12.0-informational?style=flat-square) ![AppVersion: 2.11.0](https://img.shields.io/badge/AppVersion-2.11.0-informational?style=flat-square) +![Version: 2.11.0](https://img.shields.io/badge/Version-2.11.0-informational?style=flat-square) ![AppVersion: 2.11.0](https://img.shields.io/badge/AppVersion-2.11.0-informational?style=flat-square) A Helm chart to install litmus infra components on Kubernetes From 44d3eb145518e5ca21064190d188ee6488ead787 Mon Sep 17 00:00:00 2001 From: Jasstkn Date: Sun, 21 Aug 2022 12:00:39 +0200 Subject: [PATCH 5/5] update upgrading notes Signed-off-by: Jasstkn --- charts/litmus/README.md | 2 +- charts/litmus/README.md.gotmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/litmus/README.md b/charts/litmus/README.md index 1d29d23a..9fa44b91 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -37,7 +37,7 @@ $ helm install litmus-portal litmuschaos/litmus ## Upgrading Chart -### From 2.12.X -> 2.13.X +### From 2.13.0 -> 2.13.1 We separated service configuration from `portal.server.service` to `portal.server.graphqlServer.service` and `portal.server.authServer.service`. You need to move your values to the correspondent options and upgrade as usual. diff --git a/charts/litmus/README.md.gotmpl b/charts/litmus/README.md.gotmpl index 42046559..d0f68c91 100644 --- a/charts/litmus/README.md.gotmpl +++ b/charts/litmus/README.md.gotmpl @@ -23,7 +23,7 @@ $ helm install litmus-portal litmuschaos/litmus ## Upgrading Chart -### From 2.12.X -> 2.13.X +### From 2.13.0 -> 2.13.1 We separated service configuration from `portal.server.service` to `portal.server.graphqlServer.service` and `portal.server.authServer.service`. You need to move your values to the correspondent options and upgrade as usual.