[RBAC version] update manifests to rbac.authorization.k8s.io/v1

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
habitat-sh · Sep 7, 2018 · b460488 · b460488
1 parent 9eae1e5
commit b460488
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 34 deletions.
diff --git a/examples/rbac-restricted/minikube.yml b/examples/rbac-restricted/minikube.yml
@@ -1,6 +1,6 @@
 # Wide open access to the cluster (mostly for kubelet)
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-writer
 rules:
@@ -12,7 +12,7 @@ rules:
 ---
 # Full read access to the api and resources
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-reader
 rules:
@@ -24,7 +24,7 @@ rules:
 ---
 # Give admin, kubelet, kube-system, kube-proxy god access
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-write
 subjects:

diff --git a/examples/rbac/minikube.yml b/examples/rbac/minikube.yml
@@ -1,6 +1,6 @@
 # Wide open access to the cluster (mostly for kubelet)
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-writer
 rules:
@@ -12,7 +12,7 @@ rules:
 ---
 # Full read access to the api and resources
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-reader
 rules:
@@ -24,7 +24,7 @@ rules:
 ---
 # Give admin, kubelet, kube-system, kube-proxy god access
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-write
 subjects:

diff --git a/examples/rbac/rbac.yml b/examples/rbac/rbac.yml
@@ -3,7 +3,7 @@ kind: ServiceAccount
 metadata:
   name: habitat-operator
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: habitat-operator
@@ -16,7 +16,7 @@ subjects:
   name: habitat-operator
   namespace: default
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: habitat-operator

diff --git a/helm/habitat-operator/templates/clusterrole.yaml b/helm/habitat-operator/templates/clusterrole.yaml
@@ -1,13 +1,7 @@
 {{- if not .Values.operatorNamespaced }}
 # Create this file only when the operator is meant to run clusterwide
 {{- if .Values.rbacEnable }}
-{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1beta1" }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1alpha1" }}
-apiVersion: rbac.authorization.k8s.io/v1alpha1
-{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }}
 apiVersion: rbac.authorization.k8s.io/v1
-{{- end }}
 kind: ClusterRole
 metadata:
   labels:

diff --git a/helm/habitat-operator/templates/clusterrolebinding.yaml b/helm/habitat-operator/templates/clusterrolebinding.yaml
@@ -1,13 +1,7 @@
 {{- if not .Values.operatorNamespaced }}
 # Create this file only when the operator is meant to run clusterwide
 {{- if .Values.rbacEnable }}
-{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1beta1" }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1alpha1" }}
-apiVersion: rbac.authorization.k8s.io/v1alpha1
-{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }}
 apiVersion: rbac.authorization.k8s.io/v1
-{{- end }}
 kind: ClusterRoleBinding
 metadata:
   labels:

diff --git a/helm/habitat-operator/templates/role.yaml b/helm/habitat-operator/templates/role.yaml
@@ -1,12 +1,6 @@
 {{- if .Values.operatorNamespaced }}
 {{- if .Values.rbacEnable }}
-{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1beta1" }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1alpha1" }}
-apiVersion: rbac.authorization.k8s.io/v1alpha1
-{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }}
 apiVersion: rbac.authorization.k8s.io/v1
-{{- end }}
 kind: Role
 metadata:
   labels:

diff --git a/helm/habitat-operator/templates/rolebinding.yaml b/helm/habitat-operator/templates/rolebinding.yaml
@@ -1,12 +1,6 @@
 {{- if .Values.operatorNamespaced }}
 {{- if .Values.rbacEnable }}
-{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1beta1" }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1alpha1" }}
-apiVersion: rbac.authorization.k8s.io/v1alpha1
-{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }}
 apiVersion: rbac.authorization.k8s.io/v1
-{{- end }}
 kind: RoleBinding
 metadata:
   labels:

diff --git a/test/e2e/v1beta1/clusterwide/resources/operator/cluster-role-binding.yml b/test/e2e/v1beta1/clusterwide/resources/operator/cluster-role-binding.yml
@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: habitat-operator-v1beta1

diff --git a/test/e2e/v1beta1/clusterwide/resources/operator/cluster-role.yml b/test/e2e/v1beta1/clusterwide/resources/operator/cluster-role.yml
@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: habitat-operator-v1beta1