Skip to content

Commit

Permalink
Merge #105
Browse files Browse the repository at this point in the history
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 <post@johankok.nl>
  • Loading branch information
bors[bot] and johankok authored Mar 21, 2022
2 parents 65bd664 + ffe6d6c commit c485436
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion charts/meilisearch/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions charts/meilisearch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | `{}`
| | |
Expand Down
3 changes: 2 additions & 1 deletion charts/meilisearch/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -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 -}}
Expand Down Expand Up @@ -48,7 +49,7 @@ spec:
service:
name: {{ $fullName }}
port:
number: {{ .Values.service.port }}
number: {{ $svcPort }}
{{- else }}
serviceName: {{ $fullName }}
servicePort: http
Expand Down

0 comments on commit c485436

Please sign in to comment.