Merge pull request #214 from DecisionsDev/review-gcp

Review GCP

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-11-22T11:14:58Z",
+  "generated_at": "2024-11-13T08:35:31Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -1340,15 +1340,15 @@
         "hashed_secret": "dc081999b19ee322ee45e3d4451246b7c449db0a",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 134,
+        "line_number": 143,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "5a2ea68e9ea943ea31948fe51388c798e13346a9",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 181,
+        "line_number": 185,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -1363,7 +1363,7 @@
         "verified_result": null
       },
       {
-        "hashed_secret": "8ce7feb4d1c89d5611541bafa8f7ea83a4039665",
+        "hashed_secret": "e6a8430b6dc3747f44d258a127b11f4705d9ee01",
         "is_secret": false,
         "is_verified": false,
         "line_number": 20,

platform/gcloud/README_NGINX.md

@@ -16,7 +16,11 @@ For reference, see the Google Cloud documentation https://cloud.google.com/commu
 
 ### 1. Create a NGINX Ingress controller
 
-Refer to the [Create a NGINX Ingress controller](README.md#a-create-a-nginx-ingress-controller) section if you have not created it already.
+- Use Helm to deploy the NGINX Ingress controller:
+
+  ```shell
+  helm upgrade --install ingress-nginx ingress-nginx --repo https://kubernetes.github.io/ingress-nginx --namespace ingress-nginx --create-namespace
+  ```
 
 ### 2. Install the ODM release
 
@@ -27,10 +31,10 @@ The secured HTTPS communication is managed by the NGINX ingress controller. So,
 
 Replace the placeholders in the [gcp-values.yaml](./gcp-values.yaml) file and install the chart:
 
-```
+```shell
 helm install mycompany ibm-helm/ibm-odm-prod --version 24.1.0 \
     -f gcp-values.yaml \
-    --set service.ingress.annotations={"kubernetes.io/ingress.class: nginx"}
+    --set service.ingress.class=nginx
 ```
 
 > **Note**
@@ -44,6 +48,6 @@ Refer to the [the main README](README.md#b-check-the-topology) to check the depl
 
 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).
 
-# License
+## License
 
 [Apache 2.0](/LICENSE)

platform/gcloud/gcp-values.yaml

@@ -4,24 +4,24 @@ usersPassword: "odmAdmin"
 image:
   repository: cp.icr.io/cp/cp4a/odm
   pullSecrets:
-  - <REGISTRY_SECRET>
+  - registrysecret
 
 service:
   enableTLS: false
   ingress:
     enabled: true
-    tlsSecretRef: mynicecompany-crt-secret
+    tlsSecretRef: mynicecompany-tls-secret
     host: mynicecompany.com
     tlsHosts:
     - mynicecompany.com
 
 externalDatabase:
   type: postgres
-  secretCredentials: <ODM_DB_SECRET>
+  secretCredentials: odmdbsecret
   port: 5432
   serverName: <DB_ENDPOINT>
-  databaseName: <DATABASE_NAME>
+  databaseName: postgres
   # You can get the last Google Cloud SQL PostgreSQL driver version
   # at https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/releases
   driversUrl:
-  - https://storage.googleapis.com/cloud-sql-java-connector/v1.7.1/postgres-socket-factory-1.7.1-jar-with-driver-and-dependencies.jar
+  - https://storage.googleapis.com/cloud-sql-connectors-java/v1.13.1/postgres-socket-factory-1.13.1-jar-with-driver-and-dependencies.jar

platform/gcloud/licensing-instance-NGINX.yaml

@@ -0,0 +1,17 @@
+apiVersion: operator.ibm.com/v1alpha1
+kind: IBMLicensing
+metadata:
+  name: instance
+spec:
+  apiSecretToken: ibm-licensing-token
+  datasource: datacollector
+  httpsEnable: false
+  ingressEnabled: true
+  ingressOptions:
+    annotations:
+      kubernetes.io/ingress.class: nginx
+      nginx.ingress.kubernetes.io/rewrite-target: /$2
+    path: /ibm-licensing-service-instance(/|$)(.*)
+  instanceNamespace: ibm-licensing
+  license:
+    accept: true

platform/gcloud/licensing-instance.yaml

@@ -3,12 +3,14 @@ kind: IBMLicensing
 metadata:
   name: instance
 spec:
+  apiSecretToken: ibm-licensing-token
   datasource: datacollector
-  instanceNamespace: ibm-common-services
   httpsEnable: false
   ingressEnabled: true
   ingressOptions:
     annotations:
-      kubernetes.io/ingress.class: nginx
-      nginx.ingress.kubernetes.io/rewrite-target: '/$2'
-    path: /ibm-licensing-service-instance(/|$)(.*)
+      ingress.kubernetes.io/rewrite-target: /
+    path: /ibm-licensing-service-instance/*
+  instanceNamespace: ibm-licensing
+  license:
+    accept: true