Browse Source

Merge pull request #9045 from sdodson/rbac-v1

Convert rbac v1beta to v1
Scott Dodson 6 years ago
parent
commit
116bbc9b7f

+ 1 - 1
roles/openshift_bootstrap_autoapprover/files/openshift-bootstrap-controller-policy.yaml

@@ -1,5 +1,5 @@
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: bootstrap-autoapprover
 roleRef:

+ 1 - 1
roles/openshift_bootstrap_autoapprover/files/openshift-bootstrap-controller-role.yaml

@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: system:node-bootstrap-autoapprover

+ 2 - 2
roles/openshift_cluster_monitoring_operator/files/cluster-monitoring-operator.yaml

@@ -79,7 +79,7 @@ objects:
   data:
     alertmanager.yaml: "${ALERTMANAGER_CONFIG}"
 
-- apiVersion: rbac.authorization.k8s.io/v1beta1
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: ClusterRole
   metadata: {name: cluster-monitoring-operator}
   rules:
@@ -187,7 +187,7 @@ objects:
   metadata:
     name: cluster-monitoring-operator
     namespace: ${NAMESPACE}
-- apiVersion: rbac.authorization.k8s.io/v1beta1
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: ClusterRoleBinding
   metadata:
     name: cluster-monitoring-operator

+ 1 - 1
roles/openshift_logging_elasticsearch/templates/logging-metrics-role.j2

@@ -1,5 +1,5 @@
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   annotations:

+ 1 - 1
roles/openshift_logging_elasticsearch/templates/logging-metrics-rolebinding.j2

@@ -1,5 +1,5 @@
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: prometheus-metrics-viewer

+ 2 - 2
roles/openshift_monitor_availability/files/monitor-app-create.yaml

@@ -28,7 +28,7 @@ parameters:
   # This namespace cannot be changed.
   value: openshift-monitor-availability
 objects:
-- apiVersion: rbac.authorization.k8s.io/v1beta1
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: ClusterRole
   metadata: {name: monitor-app-create}
   rules:
@@ -52,7 +52,7 @@ objects:
     name: monitor-app-create
     namespace: ${NAMESPACE}
 
-- apiVersion: rbac.authorization.k8s.io/v1beta1
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: ClusterRoleBinding
   metadata:
     name: monitor-app-create

+ 1 - 1
roles/openshift_monitor_availability/files/prometheus-k8s-role-binding.yaml

@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: prometheus-k8s

+ 1 - 1
roles/openshift_monitor_availability/files/prometheus-k8s-role.yaml

@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: prometheus-k8s

+ 3 - 3
roles/openshift_service_catalog/files/openshift_catalog_clusterroles.yml

@@ -1,5 +1,5 @@
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
@@ -33,7 +33,7 @@ rules:
   - list
   - watch
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
@@ -67,7 +67,7 @@ rules:
   - list
   - watch
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:

+ 6 - 6
roles/template_service_broker/files/rbac-template.yaml

@@ -10,7 +10,7 @@ parameters:
 objects:
 
 # Grant the service account permission to call the TSB
-- apiVersion: rbac.authorization.k8s.io/v1beta1
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: ClusterRoleBinding
   metadata:
     name: templateservicebroker-client
@@ -23,7 +23,7 @@ objects:
     name: templateservicebroker-client
 
 # to delegate authentication and authorization
-- apiVersion: rbac.authorization.k8s.io/v1beta1
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: ClusterRoleBinding
   metadata:
     name: auth-delegator-${NAMESPACE}
@@ -36,7 +36,7 @@ objects:
     name: apiserver
 
 # to have the template service broker powers
-- apiVersion: rbac.authorization.k8s.io/v1beta1
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: ClusterRoleBinding
   metadata:
     name: tsb-${NAMESPACE}
@@ -49,7 +49,7 @@ objects:
     name: apiserver
 
 # to read the config for terminating authentication
-- apiVersion: rbac.authorization.k8s.io/v1beta1
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
   metadata:
     namespace: ${KUBE_SYSTEM}
@@ -64,7 +64,7 @@ objects:
 
 # allow the kube service catalog's SA to read the static secret defined
 # above, which will contain the token for the SA that can call the TSB.
-- apiVersion: rbac.authorization.k8s.io/v1beta1
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: Role
   metadata:
     name: templateservicebroker-auth-reader
@@ -78,7 +78,7 @@ objects:
     - secrets
     verbs:
     - get
-- apiVersion: rbac.authorization.k8s.io/v1beta1
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
   metadata:
     namespace: ${NAMESPACE}