Skip to content
This repository was archived by the owner on Nov 2, 2023. It is now read-only.

Commit 097a944

Browse files
authored
Merge pull request #9 from oracle/v120-release
Support for Using existing Service Instance.
2 parents 12c76cd + 42d3686 commit 097a944

27 files changed

+728
-162
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ Samples for creating Service Instances and Bindings using `oci-service-broker`,
3838

3939
## Troubleshooting
4040

41-
See [Troubleshooting](charts/oci-service-broker/docs/troubleshoot.md#troubleshooting-guide-for-oci-service-broker) document for details on debugging common and known issues.
41+
You can use the [diagnostics tool](charts/oci-service-broker/tools/diagnostics_tool.sh) to help identify the common issues in the installation.
42+
43+
Also see [Troubleshooting](charts/oci-service-broker/docs/troubleshoot.md#troubleshooting-guide-for-oci-service-broker) document for details on debugging common and known issues.
4244

4345
## Changes
4446

charts/oci-service-broker/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
apiVersion: v1
66
description: A Helm chart for installing OCI Service Broker into a Kubernetes cluster
77
name: oci-service-broker
8-
version: 1.1.1
8+
version: 1.2.0

charts/oci-service-broker/README.md

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
- [Recommended Setup Command](docs/installation.md#recommended-setup-command)
1717
- [RBAC](docs/installation.md#rbac)
1818
- [RBAC required for OCI Service Broker](docs/installation.md#rbac-required-for-oci-service-broker)
19-
- [RBAC Permissions for registering OCI Service Broker and creating services](docs/installation.md#rbac-permissions-for-registering-service-broker-and-creating-services)
19+
- [RBAC Permissions for registering OCI Service Broker](docs/installation.md#rbac-permissions-for-registering-oci-service-broker)
2020
- [Register OCI Service Broker](docs/installation.md#register-oci-service-broker)
2121
- [Monitoring OCI Service Broker](docs/installation.md#monitoring-oci-service-broker)
2222
- [JMX](docs/installation.md#jmx)
23-
- [Guidelines for Securing OCI Service Broker](docs/security.md#guidelines-for-securing-service-broker)
23+
- [Guidelines for Securing OCI Service Broker](docs/security.md#guidelines-for-securing-oci-service-broker)
2424
- [Restrict access to Service Catalog resources using RBAC](docs/security.md#restrict-access-to-service-catalog-resources-using-rbac)
2525
- [Read-only access](docs/security.md#read-only-access)
26-
- [Full acccess](docs/security.md#full-acccess)
26+
- [Full access](docs/security.md#full-acccess)
2727
- [TLS enable endpoint](docs/security.md#tls-enable-endpoint)
28-
- [Restrict access of the OCI User used by OCI Service Broker](docs/security.md#restrict-access-of-the-oci-user-used-by-service-broker)
28+
- [Restrict access of the OCI User used by OCI Service Broker](docs/security.md#restrict-access-of-the-oci-user-used-by-oci-service-broker)
2929
- [OCI User Capabilities](docs/security.md#oci-user-capabilities)
3030
- [Policies to allow access to Services](docs/security.md#policies-to-allow-access-to-services)
3131
- [Restrict the permissions only to the required Compartments](docs/security.md#restrict-the-permissions-only-to-the-required-compartments)
32-
- [Limit access to OCI Service Broker endpoint using Networkpolicy](docs/security.md#limit-access-to-service-broker-endpoint-using-networkpolicy)
32+
- [Limit access to OCI Service Broker endpoint using Networkpolicy](docs/security.md#limit-access-to-oci-service-broker-endpoint-using-networkpolicy)
3333
- [Strategy 1-Allow access only for Service Catalog running in the same namespace](docs/security.md#strategy-1-allow-access-only-for-service-catalog-running-in-the-same-namespace)
3434
- [Strategy 2-Allow access only for Service Catalog from any namespace](docs/security.md#strategy-2-allow-access-only-for-service-catalog-from-any-namespace)
3535
- [Strategy 3-Allow access for any pods running in a certain namespace](docs/security.md#strategy-3-allow-access-for-any-pods-running-in-a-certain-namespace)
@@ -42,33 +42,39 @@
4242
- [Plans](docs/object-storage.md#plans)
4343
- [OCI User Permission requirement](docs/object-storage.md#oci-user-permission-requirement)
4444
- [Service Provision Request Parameters](docs/object-storage.md#service-provision-request-parameters)
45+
- [Provisioning a new Object Storage Service Instance](docs/object-storage.md#provisioning-a-new-object-storage-service-instance)
46+
- [Using Existing Object Storage Service Instance](docs/object-storage.md#using-an-existing-object-storage-service-instance)
4547
- [Service Binding](docs/object-storage.md#service-binding)
4648
- [Request Parameters](docs/object-storage.md#request-parameters)
4749
- [Response Credentials](docs/object-storage.md#response-credentials)
4850
- [Example](docs/object-storage.md#example)
4951
- [Kubernetes](docs/object-storage.md#kubernetes)
50-
- [Provisioning](docs/object-storage.md#provisioning)
52+
- [Creating a New Object Storage Instance](docs/object-storage.md#creating-a-new-object-storage-instance)
53+
- [Using Existing Object Storage Service Instance](docs/object-storage.md#using-an-existing-object-storage-instance)
5154
- [Binding](docs/object-storage.md#binding)
5255
- [Autonomous Transaction Processing Service](docs/atp.md#autonomous-transaction-processing-service)
5356
- [Introduction](docs/atp.md#introduction)
5457
- [Plans](docs/atp.md#plans)
5558
- [OCI User Permission requirement](docs/atp.md#oci-user-permission-requirement)
5659
- [Service Provision Request Parameters](docs/atp.md#service-provision-request-parameters)
60+
- [Provisioning a new ADW Service Instance](docs/atp.md#provisioning-a-new-atp-service-instance)
61+
- [Using Existing ADW Service Instance](docs/atp.md#using-an-existing-atp-service-instance)
5762
- [Service Binding Request Parameters](docs/atp.md#service-binding-request-parameters)
5863
- [Service Binding Response Credentials](docs/atp.md#service-binding-response-credentials)
5964
- [Examples](docs/atp.md#examples)
6065
- [Prerequisite](docs/atp.md#prerequisite)
6166
- [OCI Service Broker](docs/atp.md#oci-service-broker)
6267
- [Sample files](docs/atp.md#sample-files)
6368
- [Provisioning](docs/atp.md#provisioning)
64-
- [Creating an ATP ServiceInstance](docs/atp.md#creating-an-atp-serviceinstance)
69+
- [Creating an ATP Instance](docs/atp.md#creating-a-new-atp-instance)
70+
- [Using Existing ATP Instance](docs/atp.md#using-an-existing-atp-instance)
6571
- [Get instance status](docs/atp.md#get-instance-status)
6672
- [Binding](docs/atp.md#binding)
6773
- [Creating an ATP ServiceBinding resource](docs/atp.md#creating-an-atp-servicebinding-resource)
6874
- [Get Binding status](docs/atp.md#get-instance-status)
69-
- [Sample program to Connect to ATP](docs/atp.md#sample-program-to-connect-to-atp)
75+
- [Connecting to a provisioned ATP instance](docs/atp.md#connecting-to-a-provisioned-atp-instance)
7076
- [Create a Kubernetes Secret with passwords](docs/atp.md#create-a-kubernetes-secret-with-passwords)
71-
- [Deploy sample application](docs/atp.md#deploy-sample-application)
77+
- [Injecting credentials and configurations](docs/atp.md#injecting-credentials-and-configurations)
7278
- [Deprovision](docs/atp.md#deprovision)
7379
- [Delete Service Binding](docs/atp.md#delete-service-binding)
7480
- [Delete Service Instance](docs/atp.md#delete-service-instance)
@@ -78,21 +84,24 @@
7884
- [Plans](docs/adw.md#plans)
7985
- [OCI User Permission requirement](docs/adw.md#oci-user-permission-requirement)
8086
- [Service Provision Request Parameters](docs/adw.md#service-provision-request-parameters)
87+
- [Provisioning a new ADW Service Instance](docs/adw.md#provisioning-a-new-adw-service-instance)
88+
- [Using Existing ADW Service Instance](docs/adw.md#using-an-existing-adw-service-instance)
8189
- [Service Binding Request Parameters](docs/adw.md#service-binding-request-parameters)
8290
- [Service Binding Response Credentials](docs/adw.md#service-binding-response-credentials)
8391
- [Examples](docs/adw.md#examples)
8492
- [Prerequisite](docs/adw.md#prerequisite)
8593
- [OCI Service Broker](docs/adw.md#oci-service-broker)
8694
- [Sample files](docs/adw.md#sample-files)
8795
- [Provisioning](docs/adw.md#provisioning)
88-
- [Creating an ADW ServiceInstance](docs/adw.md#creating-an-adw-serviceinstance)
96+
- [Creating a new ADW Instance](docs/adw.md#creating-a-new-adw-instance)
97+
- [Using Existing ADW Instance](docs/adw.md#using-an-existing-adw-instance)
8998
- [Get instance status](docs/adw.md#get-instance-status)
9099
- [Binding](docs/adw.md#binding)
91100
- [Creating an ADW ServiceBinding resource](docs/adw.md#creating-an-adw-servicebinding-resource)
92101
- [Get Binding status](docs/adw.md#get-instance-status)
93-
- [Sample program to Connect to ADW](docs/adw.md#sample-program-to-connect-to-adw)
102+
- [Connecting to a provisioned ADW instance](docs/adw.md#connecting-to-a-provisioned-adw-instance)
94103
- [Create a Kubernetes Secret with passwords](docs/adw.md#create-a-kubernetes-secret-with-passwords)
95-
- [Deploy sample application](docs/adw.md#deploy-sample-application)
104+
- [Injecting credentials and configurations](docs/adw.md#injecting-credentials-and-configurations)
96105
- [Deprovision](docs/adw.md#deprovision)
97106
- [Delete Service Binding](docs/adw.md#delete-service-binding)
98107
- [Delete Service Instance](docs/adw.md#delete-service-instance)
@@ -101,12 +110,15 @@
101110
- [Introduction](docs/oss.md#introduction)
102111
- [Plans](docs/oss.md#plans)
103112
- [Service Provision Request Parameters](docs/oss.md#service-provision-request-parameters)
113+
- [Creating a OSS Service Instance](docs/oss.md#creating-a-new-oss-instance)
114+
- [Using Existing OSS Service Instance](docs/oss.md#using-an-existing-oss-service-instance)
104115
- [Service Binding](docs/oss.md#service-binding)
105116
- [Request Parameters](docs/oss.md#request-parameters)
106117
- [Response Credentials](docs/oss.md#response-credentials)
107118
- [Example](docs/oss.md#example)
108119
- [Kubernetes](docs/oss.md#kubernetes)
109-
- [Provisioning](docs/oss.md#provisioning)
120+
- [Creating a New OSS Instance](docs/oss.md#creating-a-new-oss-instance)
121+
- [Using Existing OSS Service Instance](docs/oss.md#using-an-existing-oss-instance)
110122
- [Binding](docs/oss.md#binding)
111123

112124
## Introduction
@@ -116,4 +128,6 @@ The OCI Service Broker is an open source implementation of [Open service broker
116128
- Easy installation.
117129
- Easy extension.
118130
- Provide OOTB implementations for common OCI services.
119-
- OCI Service Broker Installation.
131+
- OCI Service Broker Installation.
132+
- [Using an Existing Service Instance](docs/services.md#using-an-existing-service-instance)
133+

charts/oci-service-broker/docs/adw.md

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44
- [Plans](#plans)
55
- [OCI User Permission requirement](#oci-user-permission-requirement)
66
- [Service Provision Request Parameters](#service-provision-request-parameters)
7+
- [Provisioning a new ADW Service Instance](#provisioning-a-new-adw-service-instance)
8+
- [Using an Existing ADW Service Instance](#using-an-existing-adw-service-instance)
79
- [Service Binding Request Parameters](#service-binding-request-parameters)
810
- [Service Binding Response Credentials](#service-binding-response-credentials)
911
- [Examples](#examples)
1012
- [Prerequisite](#prerequisite)
1113
- [OCI Service Broker](#oci-service-broker)
1214
- [Sample files](#sample-files)
1315
- [Provisioning](#provisioning)
14-
- [Creating an ADW ServiceInstance](#creating-an-adw-serviceinstance)
16+
- [Creating a new ADW Instance](#creating-a-new-adw-instance)
17+
- [Using an Existing ADW Instance](#using-an-existing-adw-instance)
1518
- [Get instance status](#get-instance-status)
1619
- [Binding](#binding)
1720
- [Creating an ADW ServiceBinding resource](#creating-an-adw-servicebinding-resource)
@@ -42,7 +45,9 @@ The OCI user for OCI Service Broker should have permission `manage` for resource
4245
Allow group <SERVICE_BROKER_GROUP> to manage autonomous-data-warehouse in compartment <COMPARTMENT_NAME>
4346
```
4447

45-
## Service Provision Request Parameters
48+
### Service Provision Request Parameters
49+
50+
## Provisioning a new ADW Service Instance
4651

4752
To provision, an ADW service user needs to provide the following details:
4853

@@ -58,6 +63,20 @@ To provision, an ADW service user needs to provide the following details:
5863
| `freeFormTags` | free form tags that are to be used for tagging the ADW instance. | object | no |
5964
| `definedTags` | The defined tags that are to be used for tagging the ADW instance. | object | no |
6065

66+
## Using an Existing ADW Service Instance
67+
68+
For more information about binding to an existing ADW service instance, see [Using an Existing Service Instance](services.md#using-an-existing-service-instance).
69+
70+
To attach to an existing ADW service, the user needs to provide the following details. In this case, OCI Service broker will neither provision a new instance nor update/change the existing instance.
71+
72+
| Parameter | Description | Type | Mandatory |
73+
| ---------------- | ------------------------------------------------------------------- | ------- | --------- |
74+
| `name` | The display name for the ADW instance. | string | yes |
75+
| `ocid` | The OCID for existing ADW Instance. | string | yes |
76+
| `provisioning` | Set provisioning flag value as false. | boolean | yes |
77+
78+
79+
6180
## Service Binding Request Parameters
6281

6382
The user needs to pass the following parameters to get the binding details:
@@ -124,7 +143,7 @@ Providing password in plain text may not be an idle case. Alternatively, the use
124143

125144
Please refer [Use Secret to pass passwords](#use-secret-to-pass-passwords) section for passing the password from secrets.
126145

127-
#### Creating an ADW ServiceInstance
146+
#### Creating a new ADW Instance
128147

129148
**NOTE:**
130149
The [`adw-instance-plain.yaml`](../samples/adw/adw-instance-plain.yaml) files contain the compartment OCID in which the user wants to provision the ADW instance. The user needs to update it with their compartment OCID.
@@ -133,6 +152,15 @@ The [`adw-instance-plain.yaml`](../samples/adw/adw-instance-plain.yaml) files co
133152
kubectl create -f charts/oci-service-broker/samples/adw/adw-instance-plain.yaml
134153
```
135154

155+
#### Using an existing ADW Instance
156+
157+
**NOTE:**
158+
The [`adw-existing-instance.yaml`](../samples/adw/adw-existing-instance.yaml) files contain the instance OCID and compartment OCID which the user wants to provision as existing ADW instance. The user needs to update it with their instance OCID and compartment OCID.
159+
160+
```bash
161+
kubectl create -f charts/oci-service-broker/samples/adw/adw-existing-instance.yaml
162+
```
163+
136164
#### Get instance status
137165

138166
```bash
@@ -350,7 +378,7 @@ NAME NAMESPACE CLASS PLAN STATUS
350378
adw-instance-1 catalog adw-service standard Deprovisioning
351379
```
352380

353-
It usually takes 5-10 minutes for an instance to get deprovisioned. On successful deprviosining the ServiceInstance will be removed and won't be listed.
381+
It usually takes 5-10 minutes for an instance to get deprovisioned. On successful deprviosining the ServiceInstance will be removed and won't be listed. In case of the existing instance actual instance won't be removed.
354382

355383
### Use Secret to pass passwords
356384

charts/oci-service-broker/docs/atp.md

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44
- [Plans](#plans)
55
- [OCI User Permission requirement](#oci-user-permission-requirement)
66
- [Service Provision Request Parameters](#service-provision-request-parameters)
7+
- [Provisioning a new ATP Service Instance](#provisioning-a-new-atp-service-instance)
8+
- [Using an Existing ATP Service Instance](#using-an-existing-atp-service-instance)
79
- [Service Binding Request Parameters](#service-binding-request-parameters)
810
- [Service Binding Response Credentials](#service-binding-response-credentials)
911
- [Examples](#examples)
1012
- [Prerequisite](#prerequisite)
1113
- [OCI Service Broker](#oci-service-broker)
1214
- [Sample files](#sample-files)
1315
- [Provisioning](#provisioning)
14-
- [Creating an ATP ServiceInstance](#creating-an-atp-serviceinstance)
16+
- [Creating an ATP Instance](#creating-a-new-atp-instance)
17+
- [Using an Existing ATP Instance](#using-an-existing-atp-instance)
1518
- [Get instance status](#get-instance-status)
1619
- [Binding](#binding)
1720
- [Creating an ATP ServiceBinding resource](#creating-an-atp-servicebinding-resource)
@@ -42,7 +45,9 @@ The OCI user for OCI Service Broker should have permission `manage` for resource
4245
Allow group <SERVICE_BROKER_GROUP> to manage autonomous-database in compartment <COMPARTMENT_NAME>
4346
```
4447

45-
## Service Provision Request Parameters
48+
### Service Provision Request Parameters
49+
50+
## Provisioning a new ATP Service Instance
4651

4752
To provision, an ATP service user needs to provide the following details:
4853

@@ -58,6 +63,19 @@ To provision, an ATP service user needs to provide the following details:
5863
| `freeFormTags` | free form tags that are to be used for tagging the ATP instance. | object | no |
5964
| `definedTags` | The defined tags that are to be used for tagging the ATP instance. | object | no |
6065

66+
## Using an Existing ATP Service Instance
67+
68+
For more information about binding to an existing ATP service instance, see [Using an Existing Service Instance](services.md#using-an-existing-service-instance).
69+
70+
To attach to an existing ATP service, the user needs to provide the following details. In this case, OCI Service broker will neither provision a new instance nor update/change the existing instance.
71+
72+
| Parameter | Description | Type | Mandatory |
73+
| ---------------- | ------------------------------------------------------------------- | ------- | --------- |
74+
| `name` | The display name for the ATP instance. | string | yes |
75+
| `ocid` | The OCID for existing ATP Instance. | string | yes |
76+
| `provisioning` | Set provisioning flag value as false. | boolean | yes |
77+
78+
6179
## Service Binding Request Parameters
6280

6381
The user needs to pass the following parameters to get the binding details:
@@ -124,7 +142,7 @@ Providing password in plain text may not be an idle case. Alternatively, the use
124142

125143
Please refer [Use Secret to pass passwords](#use-secret-to-pass-passwords) section for passing the password from secrets.
126144

127-
#### Creating an ATP ServiceInstance
145+
#### Creating a New ATP Instance
128146

129147
**NOTE:**
130148
The [`atp-instance-plain.yaml`](../samples/atp/atp-instance-plain.yaml) files contain the compartment OCID in which the user wants to provision the ATP instance. The user needs to update it with their compartment OCID.
@@ -133,6 +151,15 @@ The [`atp-instance-plain.yaml`](../samples/atp/atp-instance-plain.yaml) files c
133151
kubectl create -f charts/oci-service-broker/samples/atp/atp-instance-plain.yaml
134152
```
135153

154+
#### Using an existing ATP Instance
155+
156+
**NOTE:**
157+
The [`atp-existing-instance.yaml`](../samples/atp/atp-existing-instance.yaml) files contain the instance OCID and compartment OCID which the user wants to provision as existing ATP instance. The user needs to update it with their instance OCID and compartment OCID.
158+
159+
```bash
160+
kubectl create -f charts/oci-service-broker/samples/atp/atp-existing-instance.yaml
161+
```
162+
136163
#### Get instance status
137164

138165
```bash
@@ -349,7 +376,7 @@ NAME NAMESPACE CLASS PLAN STATUS
349376
atp-instance-1 catalog atp-service standard Deprovisioning
350377
```
351378

352-
It usually takes 5-10 minutes for an instance to get deprovisioned. On successful deprviosining the ServiceInstance will be removed and won't be listed.
379+
It usually takes 5-10 minutes for an instance to get deprovisioned. On successful deprviosining the ServiceInstance will be removed and won't be listed. In case of the existing instance the actual instance won't be removed.
353380

354381
### Use Secret to pass passwords
355382

0 commit comments

Comments
 (0)