diff --git a/stable/odoo/Chart.yaml b/stable/odoo/Chart.yaml index f771376373..fe415d138c 100644 --- a/stable/odoo/Chart.yaml +++ b/stable/odoo/Chart.yaml @@ -1,5 +1,5 @@ name: odoo -version: 4.0.2 +version: 5.0.0 appVersion: 11.0.20181115 description: A suite of web based open source business apps. home: https://www.odoo.com/ diff --git a/stable/odoo/README.md b/stable/odoo/README.md index aa848d0b12..4965cb2d30 100644 --- a/stable/odoo/README.md +++ b/stable/odoo/README.md @@ -64,6 +64,7 @@ The following table lists the configurable parameters of the Odoo chart and thei | `smtpPassword` | SMTP password | `nil` | | `smtpProtocol` | SMTP protocol [`ssl`, `tls`] | `nil` | | `service.type` | Kubernetes Service type | `LoadBalancer` | +| `service.port` | Service HTTP port | `80` | | `service.loadBalancer` | Kubernetes LoadBalancerIP to request | `nil` | | `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | | `service.nodePort` | Kubernetes http node port | `""` | diff --git a/stable/odoo/templates/NOTES.txt b/stable/odoo/templates/NOTES.txt index e99c8ecc8b..c9a711cb19 100644 --- a/stable/odoo/templates/NOTES.txt +++ b/stable/odoo/templates/NOTES.txt @@ -26,11 +26,13 @@ ** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "odoo.fullname" . }} ** export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "odoo.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo "Odoo URL: http://$SERVICE_IP/" + +{{- $port:=.Values.service.port | toString }} + echo "Odoo URL: http://$SERVICE_IP{{- if ne $port "80" }}:{{ .Values.service.port }}{{ end }}/" {{- else if contains "ClusterIP" .Values.service.type }} echo "Odoo URL: http://127.0.0.1:8080/" - kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "odoo.fullname" . }} 8080:80 + kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "odoo.fullname" . }} 8080:{{ .Values.service.port }} {{- end }} {{- end }} diff --git a/stable/odoo/templates/svc.yaml b/stable/odoo/templates/svc.yaml index 55d5f34931..0e45478417 100644 --- a/stable/odoo/templates/svc.yaml +++ b/stable/odoo/templates/svc.yaml @@ -17,7 +17,7 @@ spec: {{- end }} ports: - name: http - port: 80 + port: {{ .Values.service.port }} targetPort: http {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort)))}} nodePort: {{ .Values.service.nodePort }} diff --git a/stable/odoo/values.yaml b/stable/odoo/values.yaml index e4cee02f92..f3fe532729 100644 --- a/stable/odoo/values.yaml +++ b/stable/odoo/values.yaml @@ -89,7 +89,8 @@ service: ## otherwise leave blank ## # loadBalancerIP: - + # HTTP Port + port: 80 ## Use nodePort to requets some specific port when usin NodePort ## nodePort: ""