diff --git a/charts/commento/Chart.yaml b/charts/commento/Chart.yaml
index f7a49dc7758ba03c5f13059475b26e60631ca4a4..c7db1b65ae2c8ff48cd847b441da687cd717f410 100644
--- a/charts/commento/Chart.yaml
+++ b/charts/commento/Chart.yaml
@@ -7,7 +7,7 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.1.12
+version: 0.1.13
appVersion: "v1.8.0"
diff --git a/charts/commento/README.md b/charts/commento/README.md
index 2788daacdaf150ee3887426cfc0f1c430d587819..5dd172da20576b8ed856550d59bfc473565c1f10 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 073c02f782a45f9223f2225f758fb1c20bbea62b..d3d70aaf084859261f8d13670bb0833906982310 100644
--- a/charts/commento/templates/ingress.yaml
+++ b/charts/commento/templates/ingress.yaml
@@ -1,11 +1,16 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "commento.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version -}}
+{{- if semverCompare ">=1.19" $kubeVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else -}}
+{{- if semverCompare ">=1.14" $kubeVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
+{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
@@ -27,7 +32,16 @@ spec:
http:
paths:
- path: /
+ {{- if semverCompare ">=1.19" $kubeVersion }}
+ pathType: ImplementationSpecific
+ backend:
+ service:
+ name: {{ $fullName }}
+ port:
+ number: {{ $svcPort }}
+ {{- else -}}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
+ {{- end }}
{{- end }}
diff --git a/charts/elasticsearch/Chart.yaml b/charts/elasticsearch/Chart.yaml
index aeefe2d320a3ba8574b8e6ed2bbe0630ac5abc69..2a36c0d73ed44a098660ac43a7fa95f3041f8c33 100644
--- a/charts/elasticsearch/Chart.yaml
+++ b/charts/elasticsearch/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.2.0
+version: 0.2.1
appVersion: 7.12.0
diff --git a/charts/elasticsearch/README.md b/charts/elasticsearch/README.md
index 938ea2cdf9ce4b3daeb456a12f269d2588a636e6..c1df0985fe29397babdebce39883889d97609c0f 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 4f345c0b6cba4129d6e0633e3259c55e27ab6e02..efd9dac58e8f185a852e54d871f40d6ccc03ea60 100644
--- a/charts/elasticsearch/templates/ingress.yaml
+++ b/charts/elasticsearch/templates/ingress.yaml
@@ -1,11 +1,16 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "elasticsearch.fullname" . -}}
{{- $svcPort := .Values.service.httpPort -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version -}}
+{{- if semverCompare ">=1.19" $kubeVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else -}}
+{{- if semverCompare ">=1.14" $kubeVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
+{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
@@ -33,9 +38,18 @@ spec:
paths:
{{- range .paths }}
- path: {{ . }}
+ {{- if semverCompare ">=1.19" $kubeVersion }}
+ pathType: ImplementationSpecific
+ backend:
+ service:
+ name: {{ $fullName }}
+ port:
+ number: {{ $svcPort }}
+ {{- else -}}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
+ {{- end }}
{{- end }}
{{- end }}
{{- end }}
diff --git a/charts/ghost/Chart.yaml b/charts/ghost/Chart.yaml
index 10ec60ee5ac9a065367b1d7fe0994ac7ba5bda6e..f75827dd498e2517c682dc6a532dcaa410a46d02 100644
--- a/charts/ghost/Chart.yaml
+++ b/charts/ghost/Chart.yaml
@@ -7,7 +7,7 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.5.0
+version: 0.5.1
appVersion: "4.2.0"
diff --git a/charts/ghost/README.md b/charts/ghost/README.md
index 9b751889250255d3f68158627a0ef6fe3db599fe..09a1c5dc009434cdad0f03e3cb41f36092eb777b 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 3cb02548568745524a65bd25b18043dd8892a45c..0fddae23696991fb07c53384747252b5694451bb 100644
--- a/charts/ghost/templates/ingress.yaml
+++ b/charts/ghost/templates/ingress.yaml
@@ -2,11 +2,16 @@
{{- $fullName := include "ghost.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- $maxSize := .Values.ingress.maxBodySize -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version -}}
+{{- if semverCompare ">=1.19" $kubeVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else -}}
+{{- if semverCompare ">=1.14" $kubeVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
+{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
@@ -35,9 +40,18 @@ spec:
paths:
{{- range .paths }}
- path: {{ . }}
+ {{- if semverCompare ">=1.19" $kubeVersion }}
+ pathType: ImplementationSpecific
+ backend:
+ service:
+ name: {{ $fullName }}
+ port:
+ number: {{ $svcPort }}
+ {{- else -}}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
+ {{- end }}
{{- end }}
{{- end }}
{{- end }}
diff --git a/charts/gitea/Chart.yaml b/charts/gitea/Chart.yaml
index 71e8357456f8e4246dcbe2c050dc57306b7cafe8..a93f025379cfbcb4d6759d13a32e8f03fe4dd85a 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.2
+version: 0.3.3
# This is the version number of the application being deployed.
appVersion: "1.14.0"
diff --git a/charts/gitea/README.md b/charts/gitea/README.md
index dd2e1d3df192c9531b91512c1772346f9b0e668c..1d3d27df315bde4b7b2ec3ff98cbe7d73b7edb92 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 d995aebf7209d28fd78e57d152b29798e7606eac..ceb32de95f9a9ceb9e971bff2e5feb9fd4d674b2 100644
--- a/charts/gitea/templates/ingress.yaml
+++ b/charts/gitea/templates/ingress.yaml
@@ -2,11 +2,16 @@
{{- $fullName := include "gitea.fullname" . -}}
{{- $svcPort := .Values.services.http.port -}}
{{- $maxSize := .Values.ingress.maxBodySize -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version -}}
+{{- if semverCompare ">=1.19" $kubeVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else -}}
+{{- if semverCompare ">=1.14" $kubeVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
+{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
@@ -35,9 +40,18 @@ spec:
paths:
{{- range .paths }}
- path: {{ . }}
+ {{- if semverCompare ">=1.19" $kubeVersion }}
+ pathType: ImplementationSpecific
+ backend:
+ service:
+ name: {{ $fullName }}-http
+ port:
+ number: {{ $svcPort }}
+ {{- else -}}
backend:
serviceName: {{ $fullName }}-http
servicePort: {{ $svcPort }}
+ {{- end }}
{{- end }}
{{- end }}
{{- end }}
diff --git a/charts/graylog/Chart.yaml b/charts/graylog/Chart.yaml
index 7e3ac972ca9fb00ef52d3dd4da7953c4e9b7b323..985c655c0a3d921424ba45855f4d64aef08c4401 100644
--- a/charts/graylog/Chart.yaml
+++ b/charts/graylog/Chart.yaml
@@ -7,7 +7,7 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.1.13
+version: 0.1.14
appVersion: "4.0.6"
diff --git a/charts/graylog/README.md b/charts/graylog/README.md
index 77519fcc5ad8c666ae05a29cda24f73092f0f865..e36bb9f2f9f493de3da407c714cd0484a7cdebff 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 0641f690be025868d1cd7d6e463069443bbe44a4..216aa9a0788a04f5ea72efcca257eb05caeebd7a 100644
--- a/charts/graylog/templates/ingress.yaml
+++ b/charts/graylog/templates/ingress.yaml
@@ -1,11 +1,16 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "graylog.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version -}}
+{{- if semverCompare ">=1.19" $kubeVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else -}}
+{{- if semverCompare ">=1.14" $kubeVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
+{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
@@ -33,9 +38,18 @@ spec:
paths:
{{- range .paths }}
- path: {{ . }}
+ {{- if semverCompare ">=1.19" $kubeVersion }}
+ pathType: ImplementationSpecific
+ backend:
+ service:
+ name: {{ $fullName }}
+ port:
+ number: {{ $svcPort }}
+ {{- else -}}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
+ {{- end }}
{{- end }}
{{- end }}
{{- end }}
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index a925678b5abfd8fd4cacd384135a63d639aaa306..213d571796e7c2304cdd968e9214d3babbcbf855 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.1
+version: 0.5.2
# 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 1ce5af37f5ac7f339c20b4f3d66fe6eefe80c158..04c15f5ed8440a9d351f30871b95b5a40b074aca 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 42835ee5c69af126421d5605079225b0f1bc3fc8..e51ee17f690803009029e43ee003ea8db9dccc1b 100644
--- a/charts/nextcloud/templates/ingress.yaml
+++ b/charts/nextcloud/templates/ingress.yaml
@@ -3,11 +3,16 @@
{{- $svcPort := .Values.service.port -}}
{{- $maxSize := .Values.ingress.maxBodySize -}}
{{- $webroot := .Values.settings.overwriteWebRoot -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version -}}
+{{- if semverCompare ">=1.19" $kubeVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else -}}
+{{- if semverCompare ">=1.14" $kubeVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
+{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
@@ -42,18 +47,31 @@ spec:
{{- else }}
- path: /
{{- end }}
+ {{- if semverCompare ">=1.19" $kubeVersion }}
+ pathType: ImplementationSpecific
+ backend:
+ service:
+ name: {{ $fullName }}
+ port:
+ number: {{ $svcPort }}
+ {{- else -}}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
+ {{- end }}
{{- end }}
---
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.19" $kubeVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else -}}
+{{- if semverCompare ">=1.14" $kubeVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
+{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}-dav
@@ -82,8 +100,17 @@ spec:
{{- else }}
- path: /.well-known/ca(l|rd)dav(/|.*)
{{- end }}
+ {{- if semverCompare ">=1.19" $kubeVersion }}
+ pathType: ImplementationSpecific
+ backend:
+ service:
+ name: {{ $fullName }}
+ port:
+ number: {{ $svcPort }}
+ {{- else -}}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
+ {{- end }}
{{- end }}
{{- end }}
diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index 90bfea2995eb001b55ce61b28956e35a062e3aaa..1140c8d46078d7e34c719b98a13a3eb0d8632ec4 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.2.12
+version: 0.2.13
appVersion: "3.8.14"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index 38a55a7855be7950b8eed302b80ff16b5148700a..9e8e2f787cb4d16326433375fd7dc844b64db536 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 8e368ccf2575d61e9d9f93488fa96770ebbe14b0..afece075316e537f4bf4f21d45d15b9b8a7dd1ae 100644
--- a/charts/rabbitmq/templates/ingress.yaml
+++ b/charts/rabbitmq/templates/ingress.yaml
@@ -1,11 +1,16 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "rabbitmq.fullname" . -}}
{{- $svcPort := .Values.service.mgmt.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version -}}
+{{- if semverCompare ">=1.19" $kubeVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else -}}
+{{- if semverCompare ">=1.14" $kubeVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
+{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
@@ -33,9 +38,18 @@ spec:
paths:
{{- range .paths }}
- path: {{ . }}
+ {{- if semverCompare ">=1.19" $kubeVersion }}
+ pathType: ImplementationSpecific
+ backend:
+ service:
+ name: {{ $fullName }}
+ port:
+ number: {{ $svcPort }}
+ {{- else -}}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
+ {{- end }}
{{- end }}
{{- end }}
{{- end }}
diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/Chart.yaml
index b02517090851cb4d1a663c0fac44c9beff931020..a9d7282de950f3597347b5489a099ae306ad9b23 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.0
+version: 0.3.1
# This is the version number of the application being deployed.
appVersion: "5.7.0-apache"
diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md
index 00a06623756e7895fc63528a5daa8aac43f22226..f2aab75cf5f22774141f9461acf0ee075724d8bf 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 1e1fa2990a4925e3547676098612af8e7fb0c50e..5a7f165b7898002a5b4138b8e58574b873649a9a 100644
--- a/charts/wordpress/templates/ingress.yaml
+++ b/charts/wordpress/templates/ingress.yaml
@@ -2,11 +2,16 @@
{{- $fullName := include "wordpress.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- $maxSize := .Values.ingress.maxBodySize -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version -}}
+{{- if semverCompare ">=1.19" $kubeVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else -}}
+{{- if semverCompare ">=1.14" $kubeVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
+{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
@@ -35,9 +40,18 @@ spec:
paths:
{{- range .paths }}
- path: {{ . }}
+ {{- if semverCompare ">=1.19" $kubeVersion }}
+ pathType: ImplementationSpecific
+ backend:
+ service:
+ name: {{ $fullName }}
+ port:
+ number: {{ $svcPort }}
+ {{- else -}}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
+ {{- end }}
{{- end }}
{{- end }}
{{- end }}