[incubator/fluentd-cloudwatch] update apiVersion to be compatible wit…

…h k8s >= 1.16 (helm#21660) * update apiVersion in fluentd-cloudwatch helm to be compatible with k8s >= 1.16 Signed-off-by: Simone Marcato <simone@hevelop.com> * fixed copy/paste error Signed-off-by: Simone Marcato <simone@hevelop.com> Signed-off-by: camelusluo <camelusluo@tencent.com>
camelus0211 · Jul 6, 2020 · 18a8f07 · 18a8f07
1 parent bdd68cb
commit 18a8f07
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/incubator/fluentd-cloudwatch/Chart.yaml b/incubator/fluentd-cloudwatch/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: fluentd-cloudwatch
-version: 0.12.3
+version: 0.13.0
 appVersion: v1.7.3-debian-cloudwatch-1.0
 description: A Fluentd CloudWatch Helm chart for Kubernetes.
 home: https://www.fluentd.org/

diff --git a/incubator/fluentd-cloudwatch/templates/daemonset.yaml b/incubator/fluentd-cloudwatch/templates/daemonset.yaml
@@ -1,4 +1,8 @@
+{{- if .Capabilities.APIVersions.Has "apps/v1" }}
 apiVersion: apps/v1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
 kind: DaemonSet
 metadata:
   name: {{ template "fluentd-cloudwatch.fullname" . }}

diff --git a/incubator/fluentd-cloudwatch/templates/psp.yaml b/incubator/fluentd-cloudwatch/templates/psp.yaml
@@ -1,5 +1,9 @@
 {{- if .Values.rbac.pspEnabled }}
+{{- if .Capabilities.APIVersions.Has "policy/v1beta1" }}
+apiVersion: policy/v1beta1
+{{- else }}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "fluentd-cloudwatch.fullname" . }}