[stable/sysdig] Use stable API and fix configmap issues (helm#21500)

Signed-off-by: Néstor Salceda <nestor.salceda@sysdig.com>
vboulineau · Mar 17, 2020 · 0322682 · 0322682
1 parent c0f487e
commit 0322682
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/stable/sysdig/CHANGELOG.md b/stable/sysdig/CHANGELOG.md
@@ -3,6 +3,13 @@
 This file documents all notable changes to Sysdig Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
 
+## v1.7.6
+
+### Minor changes
+
+* Use rbac.authorization.k8s.io/v1 instead of the beta1 API.
+* Fix security key duplication when enabling secure and auditLog.
+
 ## v1.7.5
 
 ### Minor changes

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

diff --git a/stable/sysdig/templates/clusterrole.yaml b/stable/sysdig/templates/clusterrole.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.rbac.create }}
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ template "sysdig.fullname" .}}
   labels:

diff --git a/stable/sysdig/templates/clusterrolebinding.yaml b/stable/sysdig/templates/clusterrolebinding.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.rbac.create }}
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ template "sysdig.fullname" .}}
   labels:

diff --git a/stable/sysdig/templates/configmap.yaml b/stable/sysdig/templates/configmap.yaml
@@ -10,18 +10,19 @@ metadata:
 data:
   dragent.yaml: |
     new_k8s: true
-{{- if .Values.secure.enabled }}
+{{- if or .Values.secure.enabled .Values.auditLog.enabled }}
     security:
+{{- if .Values.auditLog.enabled }}
+      k8s_audit_server_url: {{ .Values.auditLog.auditServerUrl }}
+      k8s_audit_server_port: {{ .Values.auditLog.auditServerPort }}
+{{- end }}
+{{- if .Values.secure.enabled }}
       enabled: true
     commandlines_capture:
       enabled: true
     memdump:
       enabled: true
 {{- end }}
-{{- if .Values.auditLog.enabled }}
-    security:
-      k8s_audit_server_url: {{ .Values.auditLog.auditServerUrl }}
-      k8s_audit_server_port: {{ .Values.auditLog.auditServerPort }}
 {{- end }}
 {{- if .Values.sysdig.settings }}
 {{ toYaml .Values.sysdig.settings | indent 4 }}