Autodetect apiVersion for Ingress (#205)

* Autodetect apiVersion for Ingress * Bump chart version * Simplified
netdata · May 17, 2021 · 9655b51 · 9655b51
1 parent 2ed0b16
commit 9655b51
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/charts/netdata/Chart.yaml b/charts/netdata/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: netdata
-version: 3.6.7
+version: 3.6.8
 description: Real-time performance monitoring, done right!
 type: application
 keywords:

diff --git a/charts/netdata/README.md b/charts/netdata/README.md
@@ -82,6 +82,7 @@ The following table lists the configurable parameters of the netdata chart and t
 
 | Parameter                                | Description                                                                                                                                            | Default                                                                   |
 |------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------|
+| `kubeVersion`                            | Kubernetes version                                                                                                                                     | Autodetected                                                              |
 | `replicaCount`                           | Number of `replicas` for the parent netdata `Deployment`                                                                                               | `1`                                                                       |
 | `image.repository`                       | Container image repo                                                                                                                                   | `netdata/netdata`                                                         |
 | `image.tag`                              | Container image tag                                                                                                                                    | Latest stable netdata release (e.g. `v1.30.1`)                            |
@@ -95,6 +96,7 @@ The following table lists the configurable parameters of the netdata chart and t
 | `service.clusterIP`                      | Specific cluster IP when service type is cluster IP. Use `None` for headless service                                                                   | Allocated an IP from your cluster's service IP range                      |
 | `service.annotations`                    | Additional annotations to add to the service                                                                                                           | `{}`                                                                      |
 | `ingress.enabled`                        | Create Ingress to access the netdata web UI                                                                                                            | `true`                                                                    |
+| `ingress.apiVersion`                     | apiVersion for the Ingress                                                                                                                             | Depends on Kubernetes version                                             |
 | `ingress.annotations`                    | Associate annotations to the Ingress                                                                                                                   | `kubernetes.io/ingress.class: nginx` and `kubernetes.io/tls-acme: "true"` |
 | `ingress.path`                           | URL path for the ingress                                                                                                                               | `/`                                                                       |
 | `ingress.hosts`                          | URL hostnames for the ingress (they need to resolve to the external IP of the ingress controller)                                                      | `netdata.k8s.local`                                                       |

diff --git a/charts/netdata/templates/_helpers.tpl b/charts/netdata/templates/_helpers.tpl
@@ -30,3 +30,25 @@ Create chart name and version as used by the chart label.
 {{- define "netdata.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Return the target Kubernetes version
+*/}}
+{{- define "netdata.kubeVersion" -}}
+{{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for ingress.
+*/}}
+{{- define "netdata.ingress.apiVersion" -}}
+{{- if .Values.ingress.apiVersion -}}
+{{- .Values.ingress.apiVersion -}}
+{{- else if semverCompare "<1.14-0" (include "netdata.kubeVersion" .) -}}
+{{- "extensions/v1beta1" -}}
+{{- else if semverCompare "<1.19-0" (include "netdata.kubeVersion" .) -}}
+{{- "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- "networking.k8s.io/v1" -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/netdata/templates/ingress.yaml b/charts/netdata/templates/ingress.yaml
@@ -2,7 +2,7 @@
 {{- $fullName := include "netdata.name" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
 
-apiVersion: extensions/v1beta1
+apiVersion: {{ include "netdata.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}