From ea381d912b43333f7a6fc0ec1d36e3dc219d98bc Mon Sep 17 00:00:00 2001
From: aiwantaozi <michelia.feng@gmail.com>
Date: Mon, 5 Aug 2019 18:31:26 +0800
Subject: [PATCH] Upgrade rancher-logging chart api version to be k8s v1.16
 compatible

Problem:
Daemonset api version extensions/v1beta1 is deperated in 1.16

Solution:
Use the capabilities API versions defined in template

Issue:
https://github.com/rancher/rancher/issues/21770
---
 .../0.1.2/charts/fluentd-tester/templates/deployment.yaml      | 1 -
 .../0.1.2/charts/fluentd/templates/daemonset.yaml              | 1 -
 .../0.1.2/charts/log-aggregator/templates/log-aggregator.yaml  | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/charts/rancher-logging/0.1.2/charts/fluentd-tester/templates/deployment.yaml b/charts/rancher-logging/0.1.2/charts/fluentd-tester/templates/deployment.yaml
index 5f7c743..9b79db7 100644
--- a/charts/rancher-logging/0.1.2/charts/fluentd-tester/templates/deployment.yaml
+++ b/charts/rancher-logging/0.1.2/charts/fluentd-tester/templates/deployment.yaml
@@ -18,7 +18,6 @@ spec:
   selector:
     matchLabels:
       app: {{ template "fluentd-tester.name" . }}
-      chart: {{ template "fluentd-tester.version" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
diff --git a/charts/rancher-logging/0.1.2/charts/fluentd/templates/daemonset.yaml b/charts/rancher-logging/0.1.2/charts/fluentd/templates/daemonset.yaml
index e7e4361..970d650 100644
--- a/charts/rancher-logging/0.1.2/charts/fluentd/templates/daemonset.yaml
+++ b/charts/rancher-logging/0.1.2/charts/fluentd/templates/daemonset.yaml
@@ -18,7 +18,6 @@ spec:
   selector:
     matchLabels:
       app: {{ template "fluentd.name" . }}
-      chart: {{ template "fluentd.version" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
diff --git a/charts/rancher-logging/0.1.2/charts/log-aggregator/templates/log-aggregator.yaml b/charts/rancher-logging/0.1.2/charts/log-aggregator/templates/log-aggregator.yaml
index 06c5553..98cd8f2 100644
--- a/charts/rancher-logging/0.1.2/charts/log-aggregator/templates/log-aggregator.yaml
+++ b/charts/rancher-logging/0.1.2/charts/log-aggregator/templates/log-aggregator.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "daemonset_api_version" . }}
 kind: DaemonSet
 metadata:
   name: {{ template "log-aggregator.fullname" . }}
@@ -18,7 +18,6 @@ spec:
   selector:
     matchLabels:
       app: {{ template "log-aggregator.name" . }}
-      chart: {{ template "log-aggregator.version" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
-- 
GitLab