Skip to content

Commit 6576a50

Browse files
pmacikpmacik
authored
Update examples to use community version of the SBO. (redhat-developer#331)
* Update examples to use community version of the Service Binding Operator in OperatorHub. * Fix typos.
1 parent dea7d0d commit 6576a50

File tree

6 files changed

+42
-43
lines changed

6 files changed

+42
-43
lines changed

‎examples/commons.mk

+2-12
Original file line numberDiff line numberDiff line change
@@ -82,24 +82,14 @@ help: ## Credit: https://gist.github.com/prwhite/8168133#gistcomment-2749866
8282

8383
## --- Service Binding Operator ---
8484

85-
.PHONY: install-service-binding-operator-source
86-
## Install the Service Binding Operator Source
87-
install-service-binding-operator-source:
88-
${Q}${EC} install_service_binding_operator_source
89-
9085
.PHONY: install-service-binding-operator-subscription
9186
## Install the Service Binding Operator Subscription
9287
install-service-binding-operator-subscription:
9388
${Q}${EC} install_service_binding_operator_subscription
9489

9590
.PHONY: install-service-binding-operator
9691
## Install the Service Binding Operator
97-
install-service-binding-operator: install-service-binding-operator-source install-service-binding-operator-subscription
98-
99-
.PHONY: uninstall-service-binding-operator-source
100-
## Uninstall the Service Binding Operator Source
101-
uninstall-service-binding-operator-source:
102-
${Q}${EC} uninstall_service_binding_operator_source
92+
install-service-binding-operator: install-service-binding-operator-subscription
10393

10494
.PHONY: uninstall-service-binding-operator-subscription
10595
## Uninstall the Service Binding Operator Subscription
@@ -108,7 +98,7 @@ uninstall-service-binding-operator-subscription:
10898

10999
.PHONY: uninstall-service-binding-operator
110100
## Uninstall the Service Binding Operator
111-
uninstall-service-binding-operator: uninstall-service-binding-operator-subscription uninstall-service-binding-operator-source
101+
uninstall-service-binding-operator: uninstall-service-binding-operator-subscription
112102

113103
## --- Backing Service DB (PostgreSQL) Operator ---
114104

‎examples/java_postgresql_customvar/README.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,17 @@ demonstrate a sample use case.
3030

3131
#### Install the Service Binding Operator
3232

33-
Navigate to the `Operators`->`OperatorHub` in the OpenShift console and in the `Other` category select the `Service Bidning Operator` operator
33+
Navigate to the `Operators`->`OperatorHub` in the OpenShift console and in the `Developer Tools` category select the `Service Binding Operator` operator
3434

3535
![Service Binding Operator as shown in OperatorHub](../../assets/operator-hub-sbo-screenshot.png)
3636

37-
and install a `stable` version.
37+
and install a `alpha` version.
38+
39+
Alternatively, you can perform the same task with this make command:
40+
41+
``` shell
42+
make install-service-binding-operator
43+
```
3844

3945
This makes the `ServiceBindingRequest` custom resource available, that the application developer will use later.
4046

‎examples/knative_postgresql_customvar/README.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,17 @@ demonstrate a sample use case.
3232

3333
#### Install the Service Binding Operator
3434

35-
Navigate to the `Operators`->`OperatorHub` in the OpenShift console and in the `Other` category select the `Service Binding Operator` operator
35+
Navigate to the `Operators`->`OperatorHub` in the OpenShift console and in the `Developer Tools` category select the `Service Binding Operator` operator
3636

3737
![Service Binding Operator as shown in OperatorHub](../../assets/operator-hub-sbo-screenshot.png)
3838

39-
and install a `stable` version.
39+
and install a `alpha` version.
40+
41+
Alternatively, you can perform the same task with this make command:
42+
43+
``` shell
44+
make install-service-binding-operator
45+
```
4046

4147
This makes the `ServiceBindingRequest` custom resource available, that the application developer will use later.
4248

@@ -53,6 +59,7 @@ This makes the `Database` custom resource available, that the application develo
5359
Navigate to the `Operators`->`OperatorHub` in the OpenShift console and in the `Cloud Provider` category select the `OpenShift Serverless Operator` operator.
5460

5561
Note that installing this operator will automatically install this set of operators:
62+
5663
* Elasticsearch Operator
5764
* Jaeger Operator
5865
* Kiali Operator

‎examples/nodejs_awsrds_varprefix/README.md

+11-4
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,21 @@ The Backing Service Operator represents a database required by the
2222
applications. We'll use [aws-rds-operator](https://github.com/operator-backing-service-samples/aws-rds) to
2323
manage off-cluster RDS database instances on AWS.
2424

25-
#### Install the Service Binding Operator using an `OperatorSource`
25+
#### Install the Service Binding Operator
2626

27-
Navigate to the `Operators`->`OperatorHub` in the OpenShift console under the `openshift-marketplace` project and in the `Other` category select the `Service Bidning Operator` operator
27+
Navigate to the `Operators`->`OperatorHub` in the OpenShift console and in the `Developer Tools` category select the `Service Binding Operator` operator
2828

2929
![Service Binding Operator as shown in OperatorHub](../../assets/operator-hub-sbo-screenshot.png)
3030

31-
and install a `stable` version.
31+
and install a `alpha` version.
3232

33-
This makes the `ServiceBindingRequest` custom resource available, that we as the application developer will [use later](#bind-the-db-to-the-shell-application).
33+
Alternatively, you can perform the same task with this make command:
34+
35+
``` shell
36+
make install-service-binding-operator
37+
```
38+
39+
This makes the `ServiceBindingRequest` custom resource available, that the application developer will use later.
3440

3541
#### Install the DB operator using an `OperatorSource`
3642

@@ -242,6 +248,7 @@ The Node.js application should be already up and running after we [imported it b
242248
Let's check by navigating to the application's route to verify that it is up. Notice that in the header it says `(DB: N/A)`. That means that the application is not connected to DB and so it should not work properly. Try the application's UI to add a fruit - it causes an error proving that the DB is not connected.
243249

244250
Now we ask the Service Binding Operator to bind the DB to the Node.js application in the following step:
251+
245252
* [Create `ServiceBindingRequest`](#create-servicebindingrequest-for-the-nodejs-application)
246253

247254
#### Create `ServiceBindingRequest` for the Node.js application

‎examples/nodejs_postgresql/README.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,17 @@ demonstrate a sample use case.
2929

3030
#### Install the Service Binding Operator
3131

32-
Navigate to the `Operators`->`OperatorHub` in the OpenShift console and in the `Other` category select the `Service Bidning Operator` operator
32+
Navigate to the `Operators`->`OperatorHub` in the OpenShift console and in the `Developer Tools` category select the `Service Binding Operator` operator
3333

3434
![Service Binding Operator as shown in OperatorHub](../../assets/operator-hub-sbo-screenshot.png)
3535

36-
and install a `stable` version.
36+
and install a `alpha` version.
37+
38+
Alternatively, you can perform the same task with this make command:
39+
40+
``` shell
41+
make install-service-binding-operator
42+
```
3743

3844
This makes the `ServiceBindingRequest` custom resource available, that the application developer will use later.
3945

@@ -201,4 +207,3 @@ spec:
201207
| Secret | The name of the intermediate secret |
202208

203209
That's it, folks!
204-

‎hack/examples-commons.sh

+4-20
Original file line numberDiff line numberDiff line change
@@ -127,34 +127,18 @@ function uninstall_postgresql_db_instance {
127127

128128
## Service Binding Operator
129129

130-
function install_service_binding_operator_source {
131-
OPSRC_NAMESPACE=redhat-developer
132-
OPSRC_NAME=redhat-developer-operators
133-
PACKAGE_NAME=service-binding-operator
134-
135-
install_operator_source $OPSRC_NAMESPACE $OPSRC_NAME
136-
wait_for_packagemanifest $PACKAGE_NAME
137-
}
138-
139-
function uninstall_service_binding_operator_source {
140-
OPSRC_NAMESPACE=redhat-developer
141-
OPSRC_NAME=redhat-developer-operators
142-
143-
uninstall_operator_source $OPSRC_NAMESPACE $OPSRC_NAME
144-
}
145-
146130
function install_service_binding_operator_subscription {
147131
NAME=service-binding-operator
148-
OPSRC_NAME=redhat-developer-operators
149-
CHANNEL=stable
132+
OPSRC_NAME=community-operators
133+
CHANNEL=alpha
150134

151135
install_operator_subscription $NAME $OPSRC_NAME $CHANNEL
152136
}
153137

154138
function uninstall_service_binding_operator_subscription {
155139
NAME=service-binding-operator
156-
OPSRC_NAME=redhat-developer-operators
157-
CHANNEL=stable
140+
OPSRC_NAME=community-operators
141+
CHANNEL=alpha
158142

159143
uninstall_operator_subscription $NAME $OPSRC_NAME $CHANNEL
160144
uninstall_current_csv $NAME $CHANNEL

0 commit comments

Comments
 (0)