From 4618eae7cd0faa9d91671c6fa0656f7c403a81b2 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 6 Oct 2026 12:06:40 +0200 Subject: [PATCH] refactor(task): update Odoo image tag and simplify release name handling - Update Odoo image tag from 19.0.20260803 to 19.0.20260926 in taskfile and test values - Simplify release name logic by removing uppercase/lowercase conversion and hyphen removal - Remove commented-out functions for HAProxy Ingress and Ingress-Nginx management - Streamline uninstall logic by removing special case handling for ingress controllers --- task | 53 ++++++--------------------------------- test_values/knd/odoo.yaml | 2 +- 2 files changed, 8 insertions(+), 47 deletions(-) diff --git a/task b/task index a2dbb30..b4950d8 100755 --- a/task +++ b/task @@ -322,8 +322,8 @@ start-and-prepare() { #FIXME: This does not work in GitHub runner env. echo "Load Odoo image." - docker pull mintsystem/odoo:19.0.20260803 - load-image mintsystem/odoo:19.0.20260803 + docker pull mintsystem/odoo:19.0.20260926 + load-image mintsystem/odoo:19.0.20260926 } load-image() { @@ -373,20 +373,6 @@ forward-nextcloud() { kubectl port-forward service/nextcloud $port:8080 } -# forward-haproxy-ingress() { -# local port=8080 -# kubectl get ingresses -# echo "Open http://\$namespace.knd.local:$port url in your browser." -# kubectl port-forward -n haproxy-ingress svc/haproxy-ingress $port:80 -# } - -# forward-ingress-nginx() { -# local port=8080 -# kubectl get ingresses -# echo "Open http://\$namespace.knd.local:$port url in your browser." -# kubectl port-forward -n ingress-nginx svc/ingress-nginx $port:80 -# } - forward-prometheus-agent() { local port=9090 echo "Connect to http://localhost:$port to access the Prometheus agent." @@ -587,7 +573,7 @@ install-chart() { echo "Set oc project to $OC_PROJECT." oc project "$OC_PROJECT" fi - local release_name="$(echo "$1" | tr '[:upper:]' '[:lower:]' | tr -d '-')" + local release_name="$1" if [[ "$1" = 'cluster-issuer' ]]; then "install-$1" "$2" @@ -636,18 +622,6 @@ install-cluster-issuer() { --values "$1" } -# install-haproxy-ingress() { -# echo 'Install haproxy-ingress/haproxy-ingress.' -# helm install haproxy-ingress haproxy-ingress/haproxy-ingress \ -# --create-namespace --namespace haproxy-ingress -# } - -# install-ingress-nginx() { -# echo 'Install ingress-nginx/ingress-nginx.' -# helm install ingress-nginx ingress-nginx/ingress-nginx \ -# --create-namespace --namespace ingress-nginx -# } - install-traefik() { echo 'Install traefik/traefik.' helm install traefik traefik/traefik \ @@ -670,7 +644,7 @@ upgrade-release() { exit 1 fi - local release_name="$(echo "$1" | tr '[:upper:]' '[:lower:]' | tr -d '-')" + local release_name="$1" if list-charts | grep -q "$1"; then echo "Upgrade $1 chart for release $release_name:" @@ -705,21 +679,10 @@ upgrade-cluster-issuer() { uninstall-release() { if test -z "$1"; then echo '\$1 is empty.'; exit; fi - local release_name="$(echo "$1" | tr '[:upper:]' '[:lower:]')" + local release_name="$1" echo "Uninstall release $release_name:" - - case "$release_name" in - "ingress-nginx") - uninstall-ingress-nginx - ;; - "haproxy-ingress") - uninstall-haproxy-ingress - ;; - *) - helm uninstall "$release_name" - ;; - esac + helm uninstall "$release_name" } uninstall-haproxy-ingress() { @@ -793,9 +756,7 @@ get-pods() { template-manifest() { if test -z "$1"; then echo '\$1 is empty.'; exit; fi if test -z "$2"; then echo '\$2 is empty.'; exit; fi - local release_name="$(echo "$1" | tr '[:upper:]' '[:lower:]')" - - # echo "Template chart $1 as release ${release_name}..." + local release_name="$1" if [[ "$1" = 'cluster-issuer' ]]; then helm --debug template "$release_name" cluster-issuer \ diff --git a/test_values/knd/odoo.yaml b/test_values/knd/odoo.yaml index edc8ad8..06bd4a2 100644 --- a/test_values/knd/odoo.yaml +++ b/test_values/knd/odoo.yaml @@ -4,7 +4,7 @@ replicas: 2 ingress: host: odoo.knd.local customDomain: odoo.local -image: mintsystem/odoo:19.0.20260803 +image: mintsystem/odoo:19.0.20260926 init: login: admin@example.com addonsGitRepos: