Skip to content

Commit f760944

Browse files
committed
Added load_balancing_resources.png + rewrote part of NGINX
1 parent ce8b56b commit f760944

File tree

3 files changed

+20
-25
lines changed

3 files changed

+20
-25
lines changed

platform/gcloud/README.md

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -352,47 +352,38 @@ This section explains how to track ODM usage with the IBM License Service.
352352

353353
#### a. Install the IBM License Service
354354

355-
Follow the **Installation** section of the [Manual installation without the Operator Lifecycle Manager (OLM)](https://www.ibm.com/docs/en/cloud-paks/foundational-services/4.9?topic=ils-installing-license-service-without-operator-lifecycle-manager-olm)
355+
Follow the **Installation** section of the [Manual installation without the Operator Lifecycle Manager (OLM)](https://www.ibm.com/docs/en/cloud-paks/foundational-services/4.10?topic=ils-installing-license-service-without-operator-lifecycle-manager-olm) and stop before it asks you to update the License Service instance. It will be done in the next paragraph.
356356

357-
> NOTE: Make sure you do not follow the instantiation part!
358-
359-
#### b. Create an NGINX Ingress controller
360-
361-
- Add the official stable repository:
362-
363-
```
364-
helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
365-
helm repo update
366-
```
367-
368-
- Use Helm to deploy the NGINX Ingress controller:
369-
370-
```
371-
helm install nginx-ingress ingress-nginx/ingress-nginx -n ibm-common-services
372-
```
373-
374-
#### c. Create the IBM Licensing instance
357+
#### b. Create the IBM Licensing instance
375358

376359
Get the [licensing-instance.yaml](./licensing-instance.yaml) file and run the following command:
377360

378361
```shell
379-
kubectl create -f licensing-instance.yaml -n ibm-common-services
362+
kubectl apply -f licensing-instance.yaml -n ibm-licensing
380363
```
381364

382365
> NOTE: You can find more information and use cases on [this page](https://www.ibm.com/docs/en/cpfs?topic=software-configuration).
383366
367+
#### c. Modify Google Load Balancer settings
368+
369+
As Google native Ingress does not support the same URL rewriting rules as other ones (such as NGINX), some settings have to be modified directly on GCP Web UI.
370+
371+
You have to look for the ibm-licensing-service-instance in the list of Ingresses, then select its Load Balancer in the list of resources at the bottom:
372+
373+
![Load balancing resources](images/load_balancing_resources.png)
374+
384375
#### d. Retrieving license usage
385376

386377
After a couple of minutes, the Ingress configuration is created and you will be able to access the IBM License Service by retrieving the URL with the following command:
387378

388379
```shell
389-
export LICENSING_URL=$(kubectl get ingress ibm-licensing-service-instance -n ibm-licensing -o jsonpath='{.status.loadBalancer.ingress[0].ip}')/ibm-licensing-service-instance
380+
export LICENSING_URL=$(kubectl get ingress ibm-licensing-service-instance -n ibm-licensing -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
390381
export TOKEN=$(kubectl get secret ibm-licensing-token -o jsonpath={.data.token} -n ibm-licensing |base64 -d)
391382
```
392383

393384
You can access the `http://${LICENSING_URL}/status?token=${TOKEN}` URL to view the licensing usage or retrieve the licensing report .zip file by running the following command:
394385

395-
```
386+
```shell
396387
curl -v "http://${LICENSING_URL}/snapshot?token=${TOKEN}" --output report.zip
397388
```
398389

platform/gcloud/README_NGINX.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ For reference, see the Google Cloud documentation https://cloud.google.com/commu
1616

1717
### 1. Create a NGINX Ingress controller
1818

19-
Refer to the [Create a NGINX Ingress controller](README.md#a-create-a-nginx-ingress-controller) section if you have not created it already.
19+
- Use Helm to deploy the NGINX Ingress controller:
20+
21+
```shell
22+
helm upgrade --install ingress-nginx ingress-nginx --repo https://kubernetes.github.io/ingress-nginx --namespace ingress-nginx --create-namespace
23+
```
2024

2125
### 2. Install the ODM release
2226

@@ -27,7 +31,7 @@ The secured HTTPS communication is managed by the NGINX ingress controller. So,
2731

2832
Replace the placeholders in the [gcp-values.yaml](./gcp-values.yaml) file and install the chart:
2933

30-
```
34+
```shell
3135
helm install mycompany ibm-helm/ibm-odm-prod --version 24.0.0 \
3236
-f gcp-values.yaml \
3337
--set service.ingress.annotations={"kubernetes.io/ingress.class: nginx"}
@@ -44,6 +48,6 @@ Refer to the [the main README](README.md#b-check-the-topology) to check the depl
4448

4549
If your ODM instances are not running properly, please refer to [our dedicated troubleshooting page](https://www.ibm.com/docs/en/odm/9.0.0?topic=900-troubleshooting-support).
4650

47-
# License
51+
## License
4852

4953
[Apache 2.0](/LICENSE)
Loading

0 commit comments

Comments
 (0)