Fixes and updates (#1112)

* Fixes and updates

Signed-off-by: Andy Tael <[email protected]>

* LB URL Update

---------

Signed-off-by: Andy Tael <[email protected]>

Author: andytael

helm/charts/obaas-sample-app/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: <your appliaction name> # Replace with your application name
+name: <your application name> # Replace with your application name
 description: A Helm chart for the OBaaS Platform Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "0.0.1"

helm/charts/obaas-sample-app/README.md

@@ -10,7 +10,7 @@ The OBaaS sample app chart is meant to serve as a developer template, and is ful
 
 Standard parameters for Kubernetes options like node affinity, HPAs, ingress and more are provided in the [values.yaml file](./values.yaml).
 
-#### OBaaS options
+## OBaaS options
 
 Within the [values.yaml file](./values.yaml), the `obaas` key allows chart developers to enable or disable OBaaS integrations like database connectivity, OpenTelemetry, MicroProfile LRA, SpringBoot, and Eureka.
 enabled: true

helm/charts/obaas-sample-app/templates/deployment.yaml

@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "obaas-app.fullname" . }}
+  namespace: {{ .Values.obaas.namespace }} 
   labels:
     {{- include "obaas-app.labels" . | nindent 4 }}
     obaas.framework: SPRING_BOOT
@@ -50,9 +51,7 @@ spec:
           {{- $obaasObs := (lookup "v1" "ConfigMap" .Values.obaas.namespace "obaas-observability-config") }}
           {{- if $.Values.obaas.mp_lra.enabled }}
             - name: MP_LRA_COORDINATOR_URL
-              value: {{ $obaas.data.MP_LRA_COORDINATOR_URL | quote }}
-            - name: MP_LRA_PARTICIPANT_URL
-              value: {{ $obaas.data.MP_LRA_PARTICIPANT_URL | quote }}
+              value: {{ $obaas.data.otmm | quote }}
           {{- end }}
           {{- if $.Values.obaas.eureka.enabled }}
             - name: EUREKA_INSTANCE_PREFER_IP_ADDRESS
@@ -68,7 +67,7 @@ spec:
           {{- end }}
           {{- if $.Values.obaas.otel.enabled }}
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: {{ $obaasObs.data.signoz-otel-colletor | quote }}
+              value: {{ (index $obaasObs.data "signoz-otel-collector") | quote }}
           {{- end }}
           {{- if $.Values.obaas.springboot.enabled }}
             - name: SPRING_PROFILES_ACTIVE
@@ -96,6 +95,8 @@ spec:
                 secretKeyRef:
                   name: {{ $.Values.obaas.database.credentialsSecret }}
                   key: db.lb_password
+            - name: LIQUIBASE_DATASOURCE_URL
+              value: "jdbc:oracle:thin:@${SPRING_DB_SERVICE}?TNS_ADMIN=/oracle/tnsadmin"
             - name: SPRING_DB_SERVICE
               valueFrom:
                 secretKeyRef:

helm/charts/obaas-sample-app/templates/hpa.yaml

@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "obaas-app.fullname" . }}
+  namespace: {{ .Values.obaas.namespace }} 
   labels:
     {{- include "obaas-app.labels" . | nindent 4 }}
 spec:

helm/charts/obaas-sample-app/templates/ingress.yaml

@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "obaas-app.fullname" . }}
+  namespace: {{ .Values.obaas.namespace }} 
   labels:
     {{- include "obaas-app.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}

helm/charts/obaas-sample-app/templates/service.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "obaas-app.fullname" . }}
+  namespace: {{ .Values.obaas.namespace }} 
   labels:
     {{- include "obaas-app.labels" . | nindent 4 }}
 spec:

helm/charts/obaas-sample-app/templates/serviceaccount.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "obaas-app.serviceAccountName" . }}
+  namespace: {{ .Values.obaas.namespace }} 
   labels:
     {{- include "obaas-app.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}

helm/charts/obaas-sample-app/values.yaml

@@ -136,20 +136,20 @@ tolerations: []
 
 affinity: {}
 
+# Oracle Backend for Microservices and AI Settings.
 obaas:
-  namespace: application
+  namespace: application                    # Replace with your namespace 
   database:
-    enabled: true
-    credentialsSecret: obaas-app-db-secrets
-    walletSecret: obaas-adb-tns-admin-1
+    enabled: true                           # If true variables with DB secret content will be created
+    credentialsSecret: obaas-app-db-secrets # Replace with your secret name
+    walletSecret: obaas-adb-tns-admin-1     # Replace with your wallet secret name
   otel:
-    enabled: true
+    enabled: true                           # Enable OpenTelemetry
   # MicroProfile LRA
   mp_lra:
-    enabled: false
+    enabled: false                          # Enable OTMM
   # Spring Boot applications
   springboot:
-    enabled: true
+    enabled: true                           # Enable Spring Boot specific variables
   eureka:
-    enabled: true
-
+    enabled: true                           # Enable Eureka client