Respect service type and make clusterIP default

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:

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
 
@@ -35,6 +35,12 @@ $ helm repo add litmuschaos https://litmuschaos.github.io/litmus-helm/
 $ helm install litmus-portal litmuschaos/litmus
 ```
 
+## Upgrading Chart
+
+### 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.
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -124,6 +130,12 @@ $ 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` |  |
+| 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"` |  |
 | portal.server.authServer.volumeMounts | list | `[]` |  |
 | portal.server.authServer.volumes | list | `[]` |  |
 | portal.server.customLabels | object | `{}` |  |
@@ -172,6 +184,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,16 +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` |  |
-| 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"` |  |
 | portal.server.serviceAccountName | string | `"litmus-server-account"` |  |
 | portal.server.tolerations | list | `[]` |  |
 | portal.server.updateStrategy | object | `{}` |  |

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.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.
+
 {{ template "chart.valuesSection" . }}
 
 {{ template "helm-docs.versionFooter" . }}

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

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 }}

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

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
@@ -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: {}