diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/Chart.yaml index 102aa577046e5a94ad50d0b3391ddd4dc0dcccd8..2872cc6914e08a927d11139f5295d555a0581e3a 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.4.7 +version: 0.4.8 # This is the version number of the application being deployed. appVersion: "5.8.3-apache" diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md index be497fcd22bc9c5507632c37e01c4b134ffba2c1..4ada1d2ea410ee9ed8e956afc823d22bdd791eab 100644 --- a/charts/wordpress/README.md +++ b/charts/wordpress/README.md @@ -1,6 +1,6 @@ # Wordpress -   +   A Helm chart for Wordpress on Kubernetes @@ -141,4 +141,4 @@ $ helm uninstall my-release | storage.persistentVolumeClaimName | string | `nil` | PVC name when existing storage volume should be used | | storage.requestedSize | string | `nil` | Size for new PVC, when no existing PVC is used | | storage.className | string | `nil` | Storage class name | -| storage.keepPvc | bool | `false` | Keep a created Persistent volume claim when uninstalling the helm chart | \ No newline at end of file +| storage.keepPvc | bool | `false` | Keep a created Persistent volume claim when uninstalling the helm chart | diff --git a/charts/wordpress/templates/ingress.yaml b/charts/wordpress/templates/ingress.yaml index b0712e95f87a9da27b3d56f3fc7ad292389758e3..10c3d2505a331e2f37c2e3a3a4516ba54722ae81 100644 --- a/charts/wordpress/templates/ingress.yaml +++ b/charts/wordpress/templates/ingress.yaml @@ -2,11 +2,11 @@ {{- $fullName := include "wordpress.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- $maxSize := .Values.ingress.maxBodySize -}} -{{- $kubeVersion := .Capabilities.KubeVersion.Version -}} -{{- if semverCompare ">=1.19" $kubeVersion }} +{{- $apiVersion := .Capabilities.APIVersions -}} +{{- if $apiVersion.Has "networking.k8s.io/v1" }} apiVersion: networking.k8s.io/v1 {{- else }} -{{- if semverCompare ">=1.14" $kubeVersion }} +{{- if $apiVersion.Has "networking.k8s.io/v1beta1" }} apiVersion: networking.k8s.io/v1beta1 {{- else }} apiVersion: extensions/v1beta1 @@ -40,7 +40,7 @@ spec: paths: {{- range .paths }} - path: {{ .path }} - {{- if semverCompare ">=1.19" $kubeVersion }} + {{- if $apiVersion.Has "networking.k8s.io/v1" }} pathType: {{ .pathType }} backend: service: