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

Rollback #42

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion charts/mint/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 3.1.0
version: 3.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
Expand Down
4 changes: 2 additions & 2 deletions charts/mint/templates/ensemble-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ spec:
imagePullPolicy: IfNotPresent
command: ['redis-server', '--port', '7379']
resources:
{{- toYaml .resources | nindent 12 }}
{{- toYaml .Values.resources | nindent 12 }}
- name: docker
image: docker:23.0.0-dind
imagePullPolicy: IfNotPresent
args: ["docker-init", "dockerd-entrypoint.sh"]
resources:
{{- toYaml .resources | nindent 12 }}
{{- toYaml .Values.resources | nindent 12 }}
env:
- name: DOCKER_TLS_CERTDIR
value: ""
Expand Down
7 changes: 3 additions & 4 deletions charts/mint/templates/hasura.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,22 +89,21 @@ spec:
port: http
- name: hasura-db
#if the values.arm_support is true, then use the arm_image, otherwise use the image

{{- if .Values.arm_support }}
{{- with .Values.components.hasura_db }}
image: "{{ .arm_image.repository }}:{{ .arm_image.tag | default $.Chart.AppVersion }}"
imagePullPolicy: {{ .arm_image.pullPolicy }}
resources:
{{- toYaml .resources | nindent 12 }}
{{- end }}
{{- else }}
{{- with .Values.components.hasura_db }}
image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}"
imagePullPolicy: {{ .image.pullPolicy }}
{{- end }}
resources:
{{- toYaml .resources | nindent 12 }}
{{- end }}

resources: {}
{{- end }}
volumeMounts:
- mountPath: /var/lib/postgresql/data
name: hasura-db
Expand Down
11 changes: 11 additions & 0 deletions charts/mint/templates/model-catalog-endpoint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ spec:
{{- end }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
initContainers:
- name: volume-mount-hack
image: busybox
command: ["sh", "-c", "chown -R 9008 /fuseki-base"]
volumeMounts:
- name: db
mountPath: /fuseki-base/databases
- name: config
mountPath: /fuseki-base/configuration
resources:
{{- toYaml .Values.resources | nindent 12 }}
containers:
- name: endpoint
{{- with .Values.components.model_catalog_endpoint }}
Expand Down
2 changes: 1 addition & 1 deletion charts/mint/templates/model-catalog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ spec:
image: redis:6.0.16-alpine
imagePullPolicy: IfNotPresent
resources:
{{- toYaml .resources | nindent 12 }}
{{- toYaml .Values.resources | nindent 12 }}
ports:
- name: redis
containerPort: 6379
Expand Down
7 changes: 6 additions & 1 deletion charts/mint/templates/post-install-hasura.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ spec:
{{- with .Values.components.hasura }}
image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}"
resources:
{{- toYaml .resources | nindent 12 }}
requests:
cpu: 200m
memory: 200Mi
limits:
cpu: 210m
memory: 210Mi
{{ end }}
env:
- name: HASURA_GRAPHQL_ENDPOINT
Expand Down
Loading
Loading