Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Respect service type and make clusterIP default #257

Merged
merged 6 commits into from
Sep 20, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make ClusterIP as a default & configurable for auth & graphql servers
Signed-off-by: Jasstkn <mariia.kotliarevskaia@gmail.com>
  • Loading branch information
Jasstkn authored and Jasstkn committed Aug 21, 2022
commit d6b79cf752359d4e694cc6c692ee8d8cdde82855
18 changes: 18 additions & 0 deletions charts/litmus/README.md
Original file line number Diff line number Diff line change
@@ -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 | `{}` | |
16 changes: 6 additions & 10 deletions charts/litmus/templates/auth-server-svc.yaml
Original file line number Diff line number Diff line change
@@ -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
16 changes: 6 additions & 10 deletions charts/litmus/templates/server-svc.yaml
Original file line number Diff line number Diff line change
@@ -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
35 changes: 19 additions & 16 deletions charts/litmus/values.yaml
Original file line number Diff line number Diff line change
@@ -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: {}