summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--files/origin-components/template-service-broker-registration.yaml2
-rw-r--r--roles/ansible_service_broker/tasks/install.yml2
-rw-r--r--roles/openshift_service_catalog/files/kubeservicecatalog_roles_bindings.yml13
-rw-r--r--roles/openshift_service_catalog/tasks/generate_certs.yml2
4 files changed, 3 insertions, 16 deletions
diff --git a/files/origin-components/template-service-broker-registration.yaml b/files/origin-components/template-service-broker-registration.yaml
index 2086978f0..ab4000430 100644
--- a/files/origin-components/template-service-broker-registration.yaml
+++ b/files/origin-components/template-service-broker-registration.yaml
@@ -9,7 +9,7 @@ parameters:
required: true
objects:
# register the tsb with the service catalog
-- apiVersion: servicecatalog.k8s.io/v1alpha1
+- apiVersion: servicecatalog.k8s.io/v1beta1
kind: ServiceBroker
metadata:
name: template-service-broker
diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml
index 0f4b71124..aa8236fe0 100644
--- a/roles/ansible_service_broker/tasks/install.yml
+++ b/roles/ansible_service_broker/tasks/install.yml
@@ -331,7 +331,7 @@
content:
path: /tmp/brokerout
data:
- apiVersion: servicecatalog.k8s.io/v1alpha1
+ apiVersion: servicecatalog.k8s.io/v1beta1
kind: ServiceBroker
metadata:
name: ansible-service-broker
diff --git a/roles/openshift_service_catalog/files/kubeservicecatalog_roles_bindings.yml b/roles/openshift_service_catalog/files/kubeservicecatalog_roles_bindings.yml
index 3324ba9be..56b2d1463 100644
--- a/roles/openshift_service_catalog/files/kubeservicecatalog_roles_bindings.yml
+++ b/roles/openshift_service_catalog/files/kubeservicecatalog_roles_bindings.yml
@@ -206,19 +206,6 @@ objects:
name: service-catalog-controller
- apiVersion: authorization.openshift.io/v1
- kind: RoleBinding
- metadata:
- name: extension-apiserver-authentication-reader-binding
- namespace: ${KUBE_SYSTEM_NAMESPACE}
- roleRef:
- name: extension-apiserver-authentication-reader
- namespace: ${KUBE_SYSTEM_NAMESPACE}
- subjects:
- - kind: ServiceAccount
- name: service-catalog-apiserver
- namespace: kube-service-catalog
-
-- apiVersion: authorization.openshift.io/v1
kind: ClusterRoleBinding
metadata:
name: system:auth-delegator-binding
diff --git a/roles/openshift_service_catalog/tasks/generate_certs.yml b/roles/openshift_service_catalog/tasks/generate_certs.yml
index 5da40ea56..5f17d2dbd 100644
--- a/roles/openshift_service_catalog/tasks/generate_certs.yml
+++ b/roles/openshift_service_catalog/tasks/generate_certs.yml
@@ -60,7 +60,7 @@
name: v1beta1.servicecatalog.k8s.io
spec:
group: servicecatalog.k8s.io
- version: v1alpha1
+ version: v1beta1
service:
namespace: "kube-service-catalog"
name: apiserver