Skip to content

Commit

Permalink
chore(immich): cleanup and fix gpu allocation (#19408)
Browse files Browse the repository at this point in the history
**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [x] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [x] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [x] ⚖️ My code follows the style guidelines of this project
- [x] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [x] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning
- [x] I made sure the title starts with `feat(chart-name):`,
`fix(chart-name):` or `chore(chart-name):`

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._
  • Loading branch information
stavros-k committed Mar 23, 2024
1 parent cb17431 commit 87bf586
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 19 deletions.
2 changes: 1 addition & 1 deletion charts/stable/immich/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ sources:
- https://hub.docker.com/r/altran1502/immich-machine-learning
- https://hub.docker.com/r/altran1502/immich-server
type: application
version: 14.2.0
version: 14.2.1
6 changes: 0 additions & 6 deletions charts/stable/immich/questions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ questions:
additional_attrs: true
type: dict
attrs:
- variable: public_login_page_message
label: Public Login Page Message
description: Custom message on the login page, should be written in HTML form.
schema:
type: string
default: ""
- variable: log_level
label: Log Level
schema:
Expand Down
3 changes: 0 additions & 3 deletions charts/stable/immich/templates/_config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ configmap:
enabled: true
data:
SERVER_PORT: {{ .Values.service.main.ports.main.port | quote }}
{{- with .Values.immich.public_login_page_message }}
PUBLIC_LOGIN_PAGE_MESSAGE: {{ . }}
{{- end }}

micro-config:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion charts/stable/immich/templates/_machinelearning.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ podSpec:
machinelearning:
enabled: true
primary: true
imageSelector: "{{ $img }}"
imageSelector: {{ $img }}
securityContext:
capabilities:
disableS6Caps: true
Expand Down
2 changes: 2 additions & 0 deletions charts/stable/immich/templates/_server.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
enabled: true
primary: true
imageSelector: image
resources:
excludeExtra: true
command: /bin/sh
args:
- -c
Expand Down
2 changes: 2 additions & 0 deletions charts/stable/immich/templates/_wait.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
enabled: true
type: init
imageSelector: alpineImage
resources:
excludeExtra: true
command:
- /bin/ash
- -c
Expand Down
7 changes: 0 additions & 7 deletions charts/stable/immich/templates/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@
{{- $_ := set .Values.service.machinelearning "enabled" false -}}
{{- end -}}

{{/* Set targetselector for GPU to microservices */}}
{{- range $gpuEntry := .Values.scaleGPU }}
{{- if $gpuEntry.gpu -}}
{{- $_ := set $gpuEntry "targetSelector" (dict "microservices" (list "microservices")) -}}
{{- end -}}
{{- end -}}

{{/* Render configuration for immich
after services, as it has references
*/}}
Expand Down
1 change: 0 additions & 1 deletion charts/stable/immich/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ securityContext:
immich:
enable_ml: true
mlImageType: mlImage
public_login_page_message: Immich
log_level: log

service:
Expand Down

0 comments on commit 87bf586

Please sign in to comment.