diff --git a/odoo/README.md b/odoo/README.md index b5bd810..7c57594 100644 --- a/odoo/README.md +++ b/odoo/README.md @@ -125,6 +125,6 @@ kubectl create job --from=cronjob/-staging-reset -staging-rese | ----------------------- | --------------------------------------- | ---------------------------- | | `upgrade.enabled` | Enable or disable the upgrade job | `false` | | `upgrade.image` | The image for the Odoo upgrade job | `mintsystem/odoo-upgrade:16` | -| `upgrade.database` | The target database for the upgrade | `upgrade` | +| `upgrade.targetDatabase` | The target database for the upgrade | `upgrade` | | `upgrade.targetVersion` | The target Odoo version for the upgrade | `""` | | `upgrade.mode` | The upgrade mode (test or production) | `test` | diff --git a/odoo/templates/upgrade-job.yaml b/odoo/templates/upgrade-job.yaml index 863f4fa..4985439 100644 --- a/odoo/templates/upgrade-job.yaml +++ b/odoo/templates/upgrade-job.yaml @@ -18,6 +18,7 @@ spec: - name: upgrade image: {{ .Values.upgrade.image }} imagePullPolicy: {{ .Values.imagePullPolicy }} + workingDir: /work args: - {{ .Values.upgrade.mode }} - --dbname @@ -30,9 +31,9 @@ spec: - name: DATABASE value: {{ .Values.database }} - name: TARGET_DATABASE - value: {{ .Values.upgrade.database }} + value: {{ .Values.upgrade.targetDatabase }} - name: TARGET_VERSION - value: {{ .Values.upgrade.targetVersion }} + value: "{{ .Values.upgrade.targetVersion }}" {{- if .Values.cnpg.enabled }} - name: PGHOST value: {{ .Release.Name }}-postgresql-rw.{{ .Release.Namespace }}.svc.cluster.local diff --git a/odoo/values.yaml b/odoo/values.yaml index 9da6b05..eb5f045 100644 --- a/odoo/values.yaml +++ b/odoo/values.yaml @@ -126,8 +126,8 @@ upgrade: enabled: false ## @param upgrade.image The image for the Odoo upgrade job image: mintsystem/odoo-upgrade:16 - ## @param upgrade.database The target database for the upgrade - database: upgrade + ## @param upgrade.targetDatabase The target database for the upgrade + targetDatabase: upgrade ## @param upgrade.targetVersion The target Odoo version for the upgrade targetVersion: "" ## @param upgrade.mode The upgrade mode (test or production) diff --git a/prompt.md b/prompt.md index 5ae78fa..7399973 100644 --- a/prompt.md +++ b/prompt.md @@ -1,14 +1,14 @@ --- -title: "Serve Helm repo files from docs root" +title: "Odoo upgrade job rename target_database to targetDatabase" author: "Janik von Rotz " state: completed date_completed: 2026-10-07 model: moonshotai/Kimi-K2.6 -input_tokens: 664306 -output_tokens: 11591 +input_tokens: 575873 +output_tokens: 5175 --- -# Serve Helm repo files from docs root +# Odoo upgrade job rename target_database to targetDatabase Note: @Clanker refers to the "ai agent" (you) who is working on this prompt file. @@ -24,21 +24,16 @@ Note: @Clanker refers to the "ai agent" (you) who is working on this prompt file ## Task -The Zensical site server everything in the `docs` folder. This project also acts as Helm repo. +Rename the var `target_database` to `targetDatabase`. -The `*.tgz` and the `index.yaml` must also be served on the website root. +Other updates: OpenShift runs the pod with an arbitrary UID, so HOME is /. The tool keeps its dumps, SSH key and state in HOME. Ensure workdir is /work. -Create symlink in the docs folder and build the Zensical site. Check if localhost:8080/index.yaml is available. +Ensure values like `TARGET_VERSION` are quoted. They are rendered as `value: 19.0`. ## Worklog -Modified the `./task` script so `package-repo` outputs `.tgz` files directly into `docs/` and `index-repo` generates `docs/index.yaml`. This is cleaner than symlinks and ensures the Zensical site serves these files natively from the website root. - -- Updated `package-repo()` in `task` to use `helm package --destination docs/` and `rm -f docs/*.tgz` before packaging. -- Updated `index-repo()` to run `helm repo index docs/`. -- Updated `commit()` to stage `docs/*.tgz` and `docs/index.yaml`. -- Removed the root-level `.tgz` and `index.yaml` files (superseded by the `docs/` versions). -- Built the Zensical site with `./task build-zensical-docs`. -- Verified `http://localhost:8080/index.yaml` and `.tgz` files all return HTTP 200. - -All requirements met. +- Renamed `.Values.upgrade.database` to `.Values.upgrade.targetDatabase` in `odoo/templates/upgrade-job.yaml` and `odoo/values.yaml` +- Added `workingDir: /work` to the upgrade container so the odoo-upgrade tool writes dumps, SSH keys, and state to a writable directory on OpenShift (where HOME is `/` and UID is arbitrary) +- Quoted `{{ .Values.upgrade.targetVersion }}` in the `TARGET_VERSION` env var so Helm renders it as a YAML string (`value: "19.0"`) instead of a number (`value: 19.0`) +- Updated `odoo/README.md` parameter table to reflect the rename +- Ran `./task lint` successfully; `./task docs` requires external pnpm dependencies not present in this environment, so README was updated manually