[stable/sysdig] Fix 1.16 compatibility errors introduced in v1.4.19 (h…

…elm#18230) * Revert "[stable/sysdig] Fixes compatibility with 1.16 (helm#17538)" This reverts commit d1811c2. Signed-off-by: Néstor Salceda <nestor.salceda@sysdig.com> * Add selector section needed for the version upgrade Signed-off-by: Néstor Salceda <nestor.salceda@sysdig.com> * Update Chart metadata and CHANGELOG Signed-off-by: Néstor Salceda <nestor.salceda@sysdig.com> * We support Kubernetes since 1.9+, with beta APIs enabled Signed-off-by: Néstor Salceda <nestor.salceda@sysdig.com>
hakman · Dec 5, 2019 · db725aa · db725aa
1 parent 8437fe1
commit db725aa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/stable/sysdig/CHANGELOG.md b/stable/sysdig/CHANGELOG.md
@@ -3,6 +3,12 @@
 This file documents all notable changes to Sysdig Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
 
+## v1.4.20
+
+### Minor changes
+
+* Fixes compatibility errors introduced in v1.4.19.
+
 ## v1.4.19
 
 ### Minor changes

diff --git a/stable/sysdig/Chart.yaml b/stable/sysdig/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: sysdig
-version: 1.4.19
+version: 1.4.20
 appVersion: 0.92.3
 description: Sysdig Monitor and Secure agent
 keywords:

diff --git a/stable/sysdig/README.md b/stable/sysdig/README.md
@@ -8,7 +8,7 @@ This chart adds the Sysdig agent for [Sysdig Monitor](https://sysdig.com/product
 
 ## Prerequisites
 
-- Kubernetes 1.2+ with Beta APIs enabled
+- Kubernetes 1.9+ with Beta APIs enabled
 
 ## Installing the Chart
 

diff --git a/stable/sysdig/templates/_helpers.tpl b/stable/sysdig/templates/_helpers.tpl
@@ -64,14 +64,3 @@ Also, we can't use a single if because lazy evaluation is not an option
     {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
 {{- end -}}
 {{- end -}}
-
-{{/*
-Return the apiVersion of daemonset.
-*/}}
-{{- define "daemonset.apiVersion" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "extensions/v1beta1" -}}
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "apps/v1" -}}
-{{- end -}}
-{{- end -}}
diff --git a/stable/sysdig/templates/daemonset.yaml b/stable/sysdig/templates/daemonset.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.sysdig.accessKey }}
-apiVersion: {{ template "daemonset.apiVersion" . }}
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ template "sysdig.fullname" . }}
@@ -9,12 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "sysdig.fullname" .}}
   template:
     metadata:
       name: {{ template "sysdig.fullname" .}}
       labels:
         app: {{ template "sysdig.fullname" .}}
-        role: monitoring
     spec:
       serviceAccountName: {{ template "sysdig.serviceAccountName" .}}
 {{- if .Values.priorityClassName }}