From 19f44ae44dce6c7c192cbededa91ff87d6c57e3a Mon Sep 17 00:00:00 2001 From: groundhog2k <10630407+groundhog2k@users.noreply.github.com> Date: Tue, 4 May 2021 14:32:04 +0200 Subject: [PATCH] Fix ingress in all helm charts (#393) Fixes #392 --- charts/commento/Chart.yaml | 2 +- charts/commento/README.md | 2 +- charts/commento/templates/ingress.yaml | 12 ++++++------ charts/elasticsearch/Chart.yaml | 2 +- charts/elasticsearch/README.md | 2 +- charts/elasticsearch/templates/ingress.yaml | 12 ++++++------ charts/ghost/Chart.yaml | 4 ++-- charts/ghost/README.md | 2 +- charts/ghost/templates/ingress.yaml | 12 ++++++------ charts/gitea/Chart.yaml | 2 +- charts/gitea/README.md | 2 +- charts/gitea/templates/ingress.yaml | 12 ++++++------ charts/graylog/Chart.yaml | 2 +- charts/graylog/README.md | 2 +- charts/graylog/templates/ingress.yaml | 12 ++++++------ charts/nextcloud/Chart.yaml | 2 +- charts/nextcloud/README.md | 2 +- charts/nextcloud/templates/ingress.yaml | 12 ++++++------ charts/rabbitmq/Chart.yaml | 2 +- charts/rabbitmq/README.md | 2 +- charts/rabbitmq/templates/ingress.yaml | 12 ++++++------ charts/remark42/Chart.yaml | 2 +- charts/remark42/README.md | 2 +- charts/remark42/templates/ingress.yaml | 12 ++++++------ charts/wordpress/Chart.yaml | 2 +- charts/wordpress/README.md | 2 +- charts/wordpress/templates/ingress.yaml | 12 ++++++------ 27 files changed, 73 insertions(+), 73 deletions(-) diff --git a/charts/commento/Chart.yaml b/charts/commento/Chart.yaml index c7db1b65..a6ea48fd 100644 --- a/charts/commento/Chart.yaml +++ b/charts/commento/Chart.yaml @@ -7,7 +7,7 @@ type: application maintainers: - name: groundhog2k -version: 0.1.13 +version: 0.1.14 appVersion: "v1.8.0" diff --git a/charts/commento/README.md b/charts/commento/README.md index 5dd172da..f3613eec 100644 --- a/charts/commento/README.md +++ b/charts/commento/README.md @@ -1,6 +1,6 @@ # Commento -   +   A Helm chart for Commento on Kubernetes diff --git a/charts/commento/templates/ingress.yaml b/charts/commento/templates/ingress.yaml index d3d70aaf..23160ed9 100644 --- a/charts/commento/templates/ingress.yaml +++ b/charts/commento/templates/ingress.yaml @@ -1,13 +1,13 @@ -{{- if .Values.ingress.enabled -}} +{{- if .Values.ingress.enabled }} {{- $fullName := include "commento.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- $kubeVersion := .Capabilities.KubeVersion.Version -}} -{{- if semverCompare ">=1.19" $kubeVersion -}} +{{- if semverCompare ">=1.19" $kubeVersion }} apiVersion: networking.k8s.io/v1 -{{- else -}} -{{- if semverCompare ">=1.14" $kubeVersion -}} +{{- else }} +{{- if semverCompare ">=1.14" $kubeVersion }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} {{- end }} @@ -39,7 +39,7 @@ spec: name: {{ $fullName }} port: number: {{ $svcPort }} - {{- else -}} + {{- else }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} diff --git a/charts/elasticsearch/Chart.yaml b/charts/elasticsearch/Chart.yaml index 2da33713..ede2a7da 100644 --- a/charts/elasticsearch/Chart.yaml +++ b/charts/elasticsearch/Chart.yaml @@ -7,6 +7,6 @@ type: application maintainers: - name: groundhog2k -version: 0.2.2 +version: 0.2.3 appVersion: 7.12.1 diff --git a/charts/elasticsearch/README.md b/charts/elasticsearch/README.md index d4967b17..d9cf9b95 100644 --- a/charts/elasticsearch/README.md +++ b/charts/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -   +   A Helm chart for Elasticsearch on Kubernetes diff --git a/charts/elasticsearch/templates/ingress.yaml b/charts/elasticsearch/templates/ingress.yaml index efd9dac5..25669f35 100644 --- a/charts/elasticsearch/templates/ingress.yaml +++ b/charts/elasticsearch/templates/ingress.yaml @@ -1,13 +1,13 @@ -{{- if .Values.ingress.enabled -}} +{{- if .Values.ingress.enabled }} {{- $fullName := include "elasticsearch.fullname" . -}} {{- $svcPort := .Values.service.httpPort -}} {{- $kubeVersion := .Capabilities.KubeVersion.Version -}} -{{- if semverCompare ">=1.19" $kubeVersion -}} +{{- if semverCompare ">=1.19" $kubeVersion }} apiVersion: networking.k8s.io/v1 -{{- else -}} -{{- if semverCompare ">=1.14" $kubeVersion -}} +{{- else }} +{{- if semverCompare ">=1.14" $kubeVersion }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} {{- end }} @@ -45,7 +45,7 @@ spec: name: {{ $fullName }} port: number: {{ $svcPort }} - {{- else -}} + {{- else }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} diff --git a/charts/ghost/Chart.yaml b/charts/ghost/Chart.yaml index 7f6b8139..de39c790 100644 --- a/charts/ghost/Chart.yaml +++ b/charts/ghost/Chart.yaml @@ -7,9 +7,9 @@ type: application maintainers: - name: groundhog2k -version: 0.6.0 +version: 0.5.4 -appVersion: "4.3.0" +appVersion: "4.2.2" dependencies: - name: mariadb diff --git a/charts/ghost/README.md b/charts/ghost/README.md index c24e9da5..48c6c056 100644 --- a/charts/ghost/README.md +++ b/charts/ghost/README.md @@ -1,6 +1,6 @@ # Ghost -   +   A Helm chart for Ghost blog on Kubernetes diff --git a/charts/ghost/templates/ingress.yaml b/charts/ghost/templates/ingress.yaml index 0fddae23..bb217dbd 100644 --- a/charts/ghost/templates/ingress.yaml +++ b/charts/ghost/templates/ingress.yaml @@ -1,14 +1,14 @@ -{{- if .Values.ingress.enabled -}} +{{- if .Values.ingress.enabled }} {{- $fullName := include "ghost.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- $maxSize := .Values.ingress.maxBodySize -}} {{- $kubeVersion := .Capabilities.KubeVersion.Version -}} -{{- if semverCompare ">=1.19" $kubeVersion -}} +{{- if semverCompare ">=1.19" $kubeVersion }} apiVersion: networking.k8s.io/v1 -{{- else -}} -{{- if semverCompare ">=1.14" $kubeVersion -}} +{{- else }} +{{- if semverCompare ">=1.14" $kubeVersion }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} {{- end }} @@ -47,7 +47,7 @@ spec: name: {{ $fullName }} port: number: {{ $svcPort }} - {{- else -}} + {{- else }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} diff --git a/charts/gitea/Chart.yaml b/charts/gitea/Chart.yaml index 0fa6d00c..075c0fa4 100644 --- a/charts/gitea/Chart.yaml +++ b/charts/gitea/Chart.yaml @@ -8,7 +8,7 @@ maintainers: - name: groundhog2k # This is the chart version -version: 0.3.5 +version: 0.3.6 # This is the version number of the application being deployed. appVersion: "1.14.1" diff --git a/charts/gitea/README.md b/charts/gitea/README.md index 97ad3f69..8ea66958 100644 --- a/charts/gitea/README.md +++ b/charts/gitea/README.md @@ -1,6 +1,6 @@ # Gitea -   +   A Helm chart for Gitea on Kubernetes diff --git a/charts/gitea/templates/ingress.yaml b/charts/gitea/templates/ingress.yaml index ceb32de9..de58af3b 100644 --- a/charts/gitea/templates/ingress.yaml +++ b/charts/gitea/templates/ingress.yaml @@ -1,14 +1,14 @@ -{{- if .Values.ingress.enabled -}} +{{- if .Values.ingress.enabled }} {{- $fullName := include "gitea.fullname" . -}} {{- $svcPort := .Values.services.http.port -}} {{- $maxSize := .Values.ingress.maxBodySize -}} {{- $kubeVersion := .Capabilities.KubeVersion.Version -}} -{{- if semverCompare ">=1.19" $kubeVersion -}} +{{- if semverCompare ">=1.19" $kubeVersion }} apiVersion: networking.k8s.io/v1 -{{- else -}} -{{- if semverCompare ">=1.14" $kubeVersion -}} +{{- else }} +{{- if semverCompare ">=1.14" $kubeVersion }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} {{- end }} @@ -47,7 +47,7 @@ spec: name: {{ $fullName }}-http port: number: {{ $svcPort }} - {{- else -}} + {{- else }} backend: serviceName: {{ $fullName }}-http servicePort: {{ $svcPort }} diff --git a/charts/graylog/Chart.yaml b/charts/graylog/Chart.yaml index 985c655c..cbb88525 100644 --- a/charts/graylog/Chart.yaml +++ b/charts/graylog/Chart.yaml @@ -7,7 +7,7 @@ type: application maintainers: - name: groundhog2k -version: 0.1.14 +version: 0.1.15 appVersion: "4.0.6" diff --git a/charts/graylog/README.md b/charts/graylog/README.md index e36bb9f2..968444ea 100644 --- a/charts/graylog/README.md +++ b/charts/graylog/README.md @@ -1,6 +1,6 @@ # Graylog -   +   A Helm chart for Graylog on Kubernetes diff --git a/charts/graylog/templates/ingress.yaml b/charts/graylog/templates/ingress.yaml index 216aa9a0..ccb9ae2e 100644 --- a/charts/graylog/templates/ingress.yaml +++ b/charts/graylog/templates/ingress.yaml @@ -1,13 +1,13 @@ -{{- if .Values.ingress.enabled -}} +{{- if .Values.ingress.enabled }} {{- $fullName := include "graylog.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- $kubeVersion := .Capabilities.KubeVersion.Version -}} -{{- if semverCompare ">=1.19" $kubeVersion -}} +{{- if semverCompare ">=1.19" $kubeVersion }} apiVersion: networking.k8s.io/v1 -{{- else -}} -{{- if semverCompare ">=1.14" $kubeVersion -}} +{{- else }} +{{- if semverCompare ">=1.14" $kubeVersion }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} {{- end }} @@ -45,7 +45,7 @@ spec: name: {{ $fullName }} port: number: {{ $svcPort }} - {{- else -}} + {{- else }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index c9eb5cde..52c65c6d 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -8,7 +8,7 @@ maintainers: - name: groundhog2k # This is the chart version. -version: 0.5.4 +version: 0.5.5 # This is the version number of the application being deployed. appVersion: "21.0.1-apache" diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md index 23b9e502..5e652e1d 100644 --- a/charts/nextcloud/README.md +++ b/charts/nextcloud/README.md @@ -1,6 +1,6 @@ # Nextcloud -   +   A Helm chart for Nextcloud on Kubernetes diff --git a/charts/nextcloud/templates/ingress.yaml b/charts/nextcloud/templates/ingress.yaml index e51ee17f..718ef106 100644 --- a/charts/nextcloud/templates/ingress.yaml +++ b/charts/nextcloud/templates/ingress.yaml @@ -1,15 +1,15 @@ -{{- if .Values.ingress.enabled -}} +{{- if .Values.ingress.enabled }} {{- $fullName := include "nextcloud.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- $maxSize := .Values.ingress.maxBodySize -}} {{- $webroot := .Values.settings.overwriteWebRoot -}} {{- $kubeVersion := .Capabilities.KubeVersion.Version -}} -{{- if semverCompare ">=1.19" $kubeVersion -}} +{{- if semverCompare ">=1.19" $kubeVersion }} apiVersion: networking.k8s.io/v1 -{{- else -}} -{{- if semverCompare ">=1.14" $kubeVersion -}} +{{- else }} +{{- if semverCompare ">=1.14" $kubeVersion }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} {{- end }} @@ -54,7 +54,7 @@ spec: name: {{ $fullName }} port: number: {{ $svcPort }} - {{- else -}} + {{- else }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml index 1140c8d4..9b574950 100644 --- a/charts/rabbitmq/Chart.yaml +++ b/charts/rabbitmq/Chart.yaml @@ -7,6 +7,6 @@ type: application maintainers: - name: groundhog2k -version: 0.2.13 +version: 0.2.14 appVersion: "3.8.14" diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md index 9e8e2f78..7923d036 100644 --- a/charts/rabbitmq/README.md +++ b/charts/rabbitmq/README.md @@ -1,6 +1,6 @@ # RabbitMQ -   +   A Helm chart for a RabbitMQ cluster on Kubernetes diff --git a/charts/rabbitmq/templates/ingress.yaml b/charts/rabbitmq/templates/ingress.yaml index afece075..b546b4f3 100644 --- a/charts/rabbitmq/templates/ingress.yaml +++ b/charts/rabbitmq/templates/ingress.yaml @@ -1,13 +1,13 @@ -{{- if .Values.ingress.enabled -}} +{{- if .Values.ingress.enabled }} {{- $fullName := include "rabbitmq.fullname" . -}} {{- $svcPort := .Values.service.mgmt.port -}} {{- $kubeVersion := .Capabilities.KubeVersion.Version -}} -{{- if semverCompare ">=1.19" $kubeVersion -}} +{{- if semverCompare ">=1.19" $kubeVersion }} apiVersion: networking.k8s.io/v1 -{{- else -}} -{{- if semverCompare ">=1.14" $kubeVersion -}} +{{- else }} +{{- if semverCompare ">=1.14" $kubeVersion }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} {{- end }} @@ -45,7 +45,7 @@ spec: name: {{ $fullName }} port: number: {{ $svcPort }} - {{- else -}} + {{- else }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} diff --git a/charts/remark42/Chart.yaml b/charts/remark42/Chart.yaml index 28945015..4377ec56 100644 --- a/charts/remark42/Chart.yaml +++ b/charts/remark42/Chart.yaml @@ -7,7 +7,7 @@ type: application maintainers: - name: groundhog2k -version: 0.1.0 +version: 0.1.1 appVersion: "v1.7.1" diff --git a/charts/remark42/README.md b/charts/remark42/README.md index afe8df2a..180bb3cb 100644 --- a/charts/remark42/README.md +++ b/charts/remark42/README.md @@ -1,6 +1,6 @@ # Remark42 -   +   A Helm chart for Remark42 on Kubernetes diff --git a/charts/remark42/templates/ingress.yaml b/charts/remark42/templates/ingress.yaml index 5cb5722c..7f32f6cb 100644 --- a/charts/remark42/templates/ingress.yaml +++ b/charts/remark42/templates/ingress.yaml @@ -1,13 +1,13 @@ -{{- if .Values.ingress.enabled -}} +{{- if .Values.ingress.enabled }} {{- $fullName := include "remark42.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- $kubeVersion := .Capabilities.KubeVersion.Version -}} -{{- if semverCompare ">=1.19" $kubeVersion -}} +{{- if semverCompare ">=1.19" $kubeVersion }} apiVersion: networking.k8s.io/v1 -{{- else -}} -{{- if semverCompare ">=1.14" $kubeVersion -}} +{{- else }} +{{- if semverCompare ">=1.14" $kubeVersion }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} {{- end }} @@ -46,7 +46,7 @@ spec: name: {{ $fullName }} port: number: {{ $svcPort }} - {{- else -}} + {{- else }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/Chart.yaml index e33d5edc..da0d6ba6 100644 --- a/charts/wordpress/Chart.yaml +++ b/charts/wordpress/Chart.yaml @@ -8,7 +8,7 @@ maintainers: type: application # This is the chart version. -version: 0.3.2 +version: 0.3.3 # This is the version number of the application being deployed. appVersion: "5.7.1-apache" diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md index 9d1b89a9..f73d57dd 100644 --- a/charts/wordpress/README.md +++ b/charts/wordpress/README.md @@ -1,6 +1,6 @@ # Wordpress -   +   A Helm chart for Wordpress on Kubernetes diff --git a/charts/wordpress/templates/ingress.yaml b/charts/wordpress/templates/ingress.yaml index 5a7f165b..d60ec9f7 100644 --- a/charts/wordpress/templates/ingress.yaml +++ b/charts/wordpress/templates/ingress.yaml @@ -1,14 +1,14 @@ -{{- if .Values.ingress.enabled -}} +{{- if .Values.ingress.enabled }} {{- $fullName := include "wordpress.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- $maxSize := .Values.ingress.maxBodySize -}} {{- $kubeVersion := .Capabilities.KubeVersion.Version -}} -{{- if semverCompare ">=1.19" $kubeVersion -}} +{{- if semverCompare ">=1.19" $kubeVersion }} apiVersion: networking.k8s.io/v1 -{{- else -}} -{{- if semverCompare ">=1.14" $kubeVersion -}} +{{- else }} +{{- if semverCompare ">=1.14" $kubeVersion }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} {{- end }} @@ -47,7 +47,7 @@ spec: name: {{ $fullName }} port: number: {{ $svcPort }} - {{- else -}} + {{- else }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} -- GitLab