Merge #105

105: Fix ingress by adding variable for service port r=alallema a=johankok

# Pull Request

## What does this PR do?
Fixes #104 

## PR checklist
Please check if your PR fulfills the following requirements:
- [x] Does this PR fix an existing issue?
- [x] Have you read the contributing guidelines?
- [x] Have you made sure that the title is accurate and descriptive of the changes?

Thank you so much for contributing to Meilisearch!


Co-authored-by: Johan Kok <[email protected]>

Author: bors[bot]

charts/meilisearch/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v0.26.0"
 description: A Helm chart for the Meilisearch search engine
 name: meilisearch
-version: 0.1.27
+version: 0.1.28
 icon: https://res.cloudinary.com/meilisearch/image/upload/v1597822872/Logo/logo_img.svg
 home: https://github.com/meilisearch/meilisearch-kubernetes/charts
 maintainers:

charts/meilisearch/README.md

@@ -74,9 +74,9 @@ helm uninstall <your-service-name>
 | | |
 | `ingress.tls`                    | TLS specification                                              | `[]`
 | | |
-| `service.port`                   | Service HTTP port                                              | `ClusterIP`
+| `service.port`                   | Service HTTP port                                              | `7700`
 | | |
-| `service.type`                   | Kubernetes Service type                                        | `7700`
+| `service.type`                   | Kubernetes Service type                                        | `ClusterIP`
 | | |
 | `service.annotations`            | Additional annotations for service                             | `{}`
 | | |

charts/meilisearch/templates/ingress.yaml

@@ -1,6 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "meilisearch.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
+{{- $svcPort := .Values.service.port -}}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
 {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
@@ -48,7 +49,7 @@ spec:
             service:
               name: {{ $fullName }}
               port:
-                number: {{ .Values.service.port }}
+                number: {{ $svcPort }}
             {{- else }}
             serviceName: {{ $fullName }}
             servicePort: http