Skip to content
Merged
Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions charts/she/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ spec:
{{- if not .Values.enterprise.config.database.external }}
- name: wait-for-postgres
image: postgres:15-alpine
resources:
{{- toYaml .Values.enterprise.initContainers.resources | nindent 10 }}
command:
- /bin/sh
- -c
Expand All @@ -39,6 +41,8 @@ spec:
{{- end }}
- name: wait-for-migration
image: bitnami/kubectl:latest
resources:
{{- toYaml .Values.enterprise.initContainers.resources | nindent 10 }}
command:
- /bin/sh
- -c
Expand Down Expand Up @@ -77,7 +81,7 @@ spec:
resources:
{{- toYaml .Values.enterprise.resources | nindent 12 }}
{{- if .Values.enterprise.config.affinityEnabled }}
affinity:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
Expand All @@ -89,4 +93,4 @@ spec:
{{- range $node := $nodeHostnames }}
- "{{ $node }}"
{{- end }}
{{- end }}
{{- end }}
8 changes: 6 additions & 2 deletions charts/she/templates/migration-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ spec:
initContainers:
- name: wait-for-postgres
image: postgres:15-alpine
resources:
{{- toYaml .Values.enterprise.initContainers.resources | nindent 10 }}
command:
- /bin/sh
- -c
Expand All @@ -34,7 +36,9 @@ spec:
containers:
- name: db-migration
image: "{{ .Values.enterprise.image.repository }}:{{ .Values.enterprise.image.tag }}"
command:
resources:
{{- toYaml .Values.enterprise.migration.resources | nindent 10 }}
command:
- /bin/sh
- -c
- |
Expand All @@ -46,4 +50,4 @@ spec:
value: {{ .Values.enterprise.config.database.url | quote }}
{{- else }}
value: "postgresql://{{ .Values.enterprise.config.postgresql.username }}:{{ .Values.enterprise.config.postgresql.password }}@{{ .Release.Name }}-postgresql:5432/{{ .Values.enterprise.config.postgresql.database }}?schema=public"
{{- end }}
{{- end }}
4 changes: 3 additions & 1 deletion charts/she/templates/postgresql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ spec:
containers:
- name: postgresql
image: {{ .Values.enterprise.config.postgresql.image }}
resources:
{{- toYaml .Values.enterprise.config.postgresql.resources | nindent 10 }}
env:
- name: POSTGRES_DB
value: {{ .Values.enterprise.config.postgresql.database }}
Expand Down Expand Up @@ -64,4 +66,4 @@ spec:
name: postgresql
selector:
app: {{ .Release.Name }}-postgresql
{{- end }}
{{- end }}
46 changes: 37 additions & 9 deletions charts/she/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,36 @@
repository: hoppscotch/hoppscotch-enterprise
tag: latest # Example: "v1.0.0"
pullPolicy: IfNotPresent
# Main application resources (for deployment.yaml)
resources:
limits:
cpu: 500m
memory: 512Mi
requests:
cpu: 250m
memory: 256Mi

# Init containers configuration (used by both deployment and migration job)
initContainers:
# Resources for init containers (wait-for-postgres, etc.)
resources:
limits:
cpu: 200m
memory: 256Mi
requests:
cpu: 100m
memory: 128Mi

migration:
upgradeEnabled: false # If true, the migration job will run on every helm upgrade
# Resources for the migration job container
resources:
limits:
cpu: 300m
memory: 256Mi
requests:
cpu: 150m
memory: 128Mi

config:
database:
Expand All @@ -31,6 +52,13 @@
database: hoppscotchEnterprise
username: hoppscotch
password: hoppscotch123
resources:
requests:
cpu: "1"
memory: "1Gi"
limits:
cpu: "1"
memory: "2Gi"

mailer:
enable: false
Expand Down Expand Up @@ -207,17 +235,17 @@
adminHost: admin.example.com
backendHost: backend.example.com
className: nginx # nginx, alb, traefik
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /
# Example AWS ALB internal configuration
# alb.ingress.kubernetes.io/scheme: "internal"
# alb.ingress.kubernetes.io/security-groups: "sg-12345678"
# alb.ingress.kubernetes.io/certificate-arn: "arn:aws:acm:region:account-id:certificate/cert-id"

annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/ssl-redirect: "false"
service.kubernetes.io/load-balancer-type: "External"
# Example AWS ALB internal configuration
# alb.ingress.kubernetes.io/scheme: "internal"
# alb.ingress.kubernetes.io/security-groups: "sg-12345678"
# alb.ingress.kubernetes.io/certificate-arn: "arn:aws:acm:region:account-id:certificate/cert-id"
annotations: {} #remove {} if you want to use service annotations

Check failure on line 245 in charts/she/values.yaml

View workflow job for this annotation

GitHub Actions / lint-test

245:22 [comments] missing starting space in comment
# service.kubernetes.io/load-balancer-type: "External"

# TLS Configuration
tls:
enabled: false
secretName: hoppscotch-tls
secretName: hoppscotch-tls
Loading