diff --git a/.gitignore b/.gitignore index c73d94c..a34eb2e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ tmp manifest.yaml .obsidian/appearance.json .obsidian/graph.json -.obsidian/workspace.json \ No newline at end of file +.obsidian/workspace.json +odoo/charts \ No newline at end of file diff --git a/index.md b/index.md index 7abc316..f1ec92a 100644 --- a/index.md +++ b/index.md @@ -58,7 +58,7 @@ psotgres: enabled: false ``` -Confirm with *Create* +Confirm with *Create*. ## Develop @@ -95,6 +95,12 @@ task start-minikube Ensure you have `kubectl` installed and can access the cluster. +Add this repo for Chart dependencies. + +```bash +task add-repo +``` + The following command applies the Odoo chart: ```bash diff --git a/odoo/charts/postgres-0.1.0.tgz b/odoo/charts/postgres-0.1.0.tgz deleted file mode 100644 index 63f319b..0000000 Binary files a/odoo/charts/postgres-0.1.0.tgz and /dev/null differ diff --git a/odoo/templates/odoo-ingress.yaml b/odoo/templates/odoo-ingress.yaml index e74afae..d526ca4 100644 --- a/odoo/templates/odoo-ingress.yaml +++ b/odoo/templates/odoo-ingress.yaml @@ -1,3 +1,13 @@ +{{- if eq .Values.ingress.className "haproxy" }} +--- +apiVersion: networking.k8s.io/v1 +kind: IngressClass +metadata: + name: haproxy +spec: + controller: haproxy-ingress.github.io/controller +{{- end }} +--- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -8,9 +18,7 @@ metadata: nginx.ingress.kubernetes.io/rewrite-target: / {{- end }} spec: - {{- if eq .Values.ingress.className "nginx" }} ingressClassName: {{ .Values.ingress.className }} - {{- end }} rules: - host: {{ .Values.ingress.host }} http: diff --git a/odoo/templates/odoo-secret.yaml b/odoo/templates/odoo-secret.yaml index 9407fc3..5d67f9c 100644 --- a/odoo/templates/odoo-secret.yaml +++ b/odoo/templates/odoo-secret.yaml @@ -10,7 +10,7 @@ data: PGHOST: {{ .Values.postgres.host | b64enc | quote }} PGUSER: {{ .Values.postgres.user | b64enc | quote }} PGPASSWORD: {{ .Values.postgres.password | b64enc | quote }} - ODOO_DATABASE: {{ .Values.odoo.database | quote }} + ODOO_DATABASE: {{ .Values.odoo.database | b64enc | quote }} {{- end }} {{- if .Values.vshnpostgresql.enabled }} PGHOST: '{{ (lookup "v1" "Secret" .Release.Namespace "postgresql-credentials").data.POSTGRESQL_HOST | b64dec }}' diff --git a/odoo/values.yaml b/odoo/values.yaml index 4e2e1e7..f6fe3e1 100644 --- a/odoo/values.yaml +++ b/odoo/values.yaml @@ -1,21 +1,18 @@ ingress: className: haproxy host: odoo.cloud.local - vshnpostgresql: enabled: false - postgres: enabled: true host: postgres user: odoo password: odoo - odoo: image: mintsystem/odoo:18.0.20250401 host: odoo proxyMode: True addonsGitRepos: "https://github.com/Mint-System/Odoo-Apps-Server-Tools.git#18.0,https://github.com/OCA/Server-Tools.git#18.0" - database: "odoo" + database: odoo initLang: de_CH listDB: False diff --git a/task b/task index 62b1189..5c5fbd1 100755 --- a/task +++ b/task @@ -178,7 +178,6 @@ function test-k8s() { delete-kind else start-kind - install-chart postgres install-chart odoo fi } @@ -224,7 +223,7 @@ function list() { helm list } -function package-repo() { +function pacage-repo() { echo "Package Helm Charts." helm package postgres helm package odoo