From 2ff4c5c40ba136358bf67f4f6671d8b6a16132dd Mon Sep 17 00:00:00 2001
From: jinyuan <liujinyuan@inspur.com>
Date: Wed, 24 Feb 2021 15:33:34 +0800
Subject: [PATCH] Update rbac api version for elastic-metricbeat

When using a helm3 to deploy , it fail! Helm3 no more support rbac.authorization.k8s.io/v1beta1 , but v1 can support helm2 and helm3.This change optimized deployment.

Change-Id: I41ca3ee2490eadce8d043cf6a757bf8569f31931
---
 elastic-metricbeat/Chart.yaml                        | 2 +-
 elastic-metricbeat/templates/deployment-modules.yaml | 2 +-
 releasenotes/notes/elastic-metricbeat.yaml           | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/elastic-metricbeat/Chart.yaml b/elastic-metricbeat/Chart.yaml
index bf23344f2..b9bca9117 100644
--- a/elastic-metricbeat/Chart.yaml
+++ b/elastic-metricbeat/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v7.1.0
 description: OpenStack-Helm Elastic Metricbeat
 name: elastic-metricbeat
-version: 0.1.1
+version: 0.1.2
 home: https://www.elastic.co/products/beats/metricbeat
 sources:
   - https://github.com/elastic/beats/tree/master/metricbeat
diff --git a/elastic-metricbeat/templates/deployment-modules.yaml b/elastic-metricbeat/templates/deployment-modules.yaml
index ce4a961d1..e784cdd19 100644
--- a/elastic-metricbeat/templates/deployment-modules.yaml
+++ b/elastic-metricbeat/templates/deployment-modules.yaml
@@ -20,7 +20,7 @@ limitations under the License.
 {{- $serviceAccountName := printf "%s-%s" .Release.Name "metricbeat-deployments" }}
 {{ tuple $envAll "metricbeat" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ $serviceAccountName }}
diff --git a/releasenotes/notes/elastic-metricbeat.yaml b/releasenotes/notes/elastic-metricbeat.yaml
index 909714723..83afc01a4 100644
--- a/releasenotes/notes/elastic-metricbeat.yaml
+++ b/releasenotes/notes/elastic-metricbeat.yaml
@@ -2,4 +2,5 @@
 elastic-metricbeat:
   - 0.1.0 Initial Chart
   - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
+  - 0.1.2 Update RBAC apiVersion from /v1beta1 to /v1
 ...