From 76bcd2c2ec40ed9e825f1f3f0a371af2cb8de7a2 Mon Sep 17 00:00:00 2001
From: Janik von Rotz <login@janikvonrotz.ch>
Date: Thu, 17 Apr 2025 18:52:57 +0200
Subject: [PATCH] feat: support haproxy

---
 .gitignore                       |   3 ++-
 index.md                         |   8 +++++++-
 odoo/charts/postgres-0.1.0.tgz   | Bin 1224 -> 0 bytes
 odoo/templates/odoo-ingress.yaml |  12 ++++++++++--
 odoo/templates/odoo-secret.yaml  |   2 +-
 odoo/values.yaml                 |   5 +----
 task                             |   3 +--
 7 files changed, 22 insertions(+), 11 deletions(-)
 delete mode 100644 odoo/charts/postgres-0.1.0.tgz

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 63f319b29384bd46ba56cb21d62726aaf944dc56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1224
zcmV;(1ULI1iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PI;^Z`(E(&NY9<dE1-zLf?)8=<4n2tQ|J5hTXLn!_d$YV-t}?
zhNQe1b^rSy%9177kpk3p7C_I9E$SS8NPM1i4#k;NOF^Xdc7=s9H#mteP7T|(ZGSY<
zzqW0+e{IimE}To-wjFom`rd`@c(!|a0rtsfas-)FSX|iOJyv^h&jgs$Pee${(g4;j
z!kkx^j%k}Viiiva<w`eAXsTeok%}ZR-R&H-VhIUgr4*NeW!+^9B2uD=G#43-BMT*%
zrV7)P2pJ#)NP=k`fXp~&Lj6CXsWPPQ(hOG!AjNri^^x8si}$E#F1IUE8%_eioX0f8
z`Q*^LoVRT{rj4HZ!9EjI{9ofZBl3p`Kp+1d@2bsz*S{M0e-4!IKR^I9!OI%Q0>?LS
z%xOvxz=}y#qaQ%D2!KV5A%IL0QC)B><=;$1MZ;4sZ$J+!{wtF37%L*JvdIXO)5t+D
z|3`j{|Gw)v1OLwf!!S@I2XN3GO``zbvh<cNCzzvzC>&vhgDN=hcZfDZ05M*WSc?ec
zLAj<B+ViPbIp865@joIwW}ENVfFAxk-pFh5|H^Uwf&b?~oBx<|X;mUH);k~}sp?Px
zBsmH5W<hi|E(357fFv;q6%&OhBv^&3-)bt+)(L=e2ksnd<K>7OzK7lb<ur1HY+rJe
z9>#9oU%!I+smOLqe=|>S;M=##wn~PM8S7h3>%5ey4OI+RO=8M~3gB|&xit%tu74IR
zX*)?03ZiD@ws|8*TYLqH<l&HoYCo!jQoT#8S)3(g!m{*mF-hJ!#cCCRwZ_7V>7r7K
z``F4~73vr*TA=zEM_x<YP(RjuTS`Sz^+~(EjWKOKu`qA?y|J+S*vO}2=v!#01iR3s
z|9l;uBmwNp|9rn)|M?@&9rXVkcrgE)9;04I6ljvJ)MBZaz{}iO%7UZ`PBR=M033!y
z$_a}~F)(08aP(PFMJ71i=zt<wCc@G{ko%0ty)^AQ55TeCQS|7Q^e>{7&=zM+F$;10
zn1zLy<B+ON;oO|$qn4cqBdxUhKG&N2LMyCQsOO8*X<8Tmi%|5#^FRCY;QZ&xalL{6
z=fH!knd_I|S^VwtkDl5O0Zc#4Kfaq?&%eC?F#p(*fNf#nk4PHA7Va~qb~#q%J^tyq
zZ?x$1{9}GSJMNoFBKo|iZ|3vQA7<m@J(LGtM|*kd*V~Iu{+}uSyO#&&KO=WI|2+#j
z_%GHp><X5h)Gy;?tuQk5MWYT<SS*QZlt<07vDxW=pH9yX75`_~Z^n~rGl@<=Mj!vL
z-1hm8>-nRB|L4HV8oU1Y=a_|eM8GflfMcf#@Jiw3>%U%=A9!i9H06qtIFcr1R-|35
zwe_V69G2so_U_ZsYlMz|G)6C9LJ>(3nhJ7D{|Vrx?BE8WE&NJ0g-C4S<AxLcXH0H!
z7OUnt!xnA9*a6DFuy3nF8yDv{x<jc1O_#9UkG=oub)$`SV)BsjO=}v_qP(aXvxu=9
mIGnRiJsxXZ%QE_mpL$CT7%<?O;NJiM0RR6kNTx3UCIA4Kfm~t$

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