From 30bd8643e4d67a43d45656a1d1604d8bbd75e2fc Mon Sep 17 00:00:00 2001 From: jinyuan Date: Thu, 18 Feb 2021 14:52:38 +0800 Subject: [PATCH] Update rbac api version for glance When using a helm3 to deploy , it fails Helm3 no more support rbac.authorization.k8s.io/v1beta1 , but v1 can support helm2 and helm3. This change optimized deployment. Change-Id: I107d6e965ca00a6d8b766e91573be2c9aeb4f782 --- glance/Chart.yaml | 2 +- glance/templates/job-clean.yaml | 4 ++-- glance/templates/job-storage-init.yaml | 4 ++-- releasenotes/notes/glance.yaml | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/glance/Chart.yaml b/glance/Chart.yaml index e97de75268..2a1ebadd1d 100644 --- a/glance/Chart.yaml +++ b/glance/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Glance name: glance -version: 0.1.3 +version: 0.1.4 home: https://docs.openstack.org/glance/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png sources: diff --git a/glance/templates/job-clean.yaml b/glance/templates/job-clean.yaml index cdcd61e700..fc2b4e0271 100644 --- a/glance/templates/job-clean.yaml +++ b/glance/templates/job-clean.yaml @@ -19,7 +19,7 @@ limitations under the License. {{- $serviceAccountName := print "glance-clean" }} {{ tuple $envAll "clean" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: {{ $serviceAccountName }} @@ -32,7 +32,7 @@ rules: - get - delete --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: {{ $serviceAccountName }} diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml index 82524086f7..5eef64f03d 100644 --- a/glance/templates/job-storage-init.yaml +++ b/glance/templates/job-storage-init.yaml @@ -18,7 +18,7 @@ limitations under the License. {{- $serviceAccountName := "glance-storage-init" }} {{ tuple $envAll "storage_init" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: {{ $serviceAccountName }} @@ -33,7 +33,7 @@ rules: - update - patch --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: {{ $serviceAccountName }} diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml index 86a9c75831..6660eb1a5e 100644 --- a/releasenotes/notes/glance.yaml +++ b/releasenotes/notes/glance.yaml @@ -4,3 +4,4 @@ glance: - 0.1.1 Change helm-toolkit dependency to >= 0.1.0 - 0.1.2 Change issuer to clusterissuer - 0.1.3 Revert - Change issuer to clusterissuer + - 0.1.4 Update RBAC apiVersion from /v1beta1 to /v1