Addressed conflicts

Addressed conflicts and removed OCA requirements for Peter.

Author: Kuassim

MtdrSpring/backend/target/classes/application.properties

@@ -1,9 +1,9 @@
-spring.jpa.database-platform=org.hibernate.dialect.Oracle12cDialect
-oracle.jdbc.fanEnabled=false
+#spring.jpa.database-platform=org.hibernate.dialect.Oracle12cDialect
+#oracle.jdbc.fanEnabled=false
 ##this is not used when deployed in kubernetes. Just for local testing
-spring.datasource.url=jdbc:oracle:thin:@adbps_medium?TNS_ADMIN=/Users/psong/Downloads/Wallet_ADBPS
-spring.datasource.username=admin
-spring.datasource.password=WELcome__12345
+#spring.datasource.url=jdbc:oracle:thin:@adbps_medium?TNS_ADMIN=/Users/psong/Downloads/Wallet_ADBPS
+#spring.datasource.username=admin
+#spring.datasource.password=WELcome__12345
 
 ##Properties of UCP
 spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
@@ -20,5 +20,5 @@ logging.level.root=trace
 logging.file.name=logs.log
 logging.level.oracle.ucp=trace
 
-spring.security.user.name=psomg
-spring.security.user.password=WELcome__12345
+#spring.security.user.name=psong
+#spring.security.user.password=WELcome__12345

MtdrSpring/backend/target/classes/application.yaml

@@ -10,3 +10,7 @@ spring:
     hibernate:
       ddl-auto: none
     show-sql: true
+  security:
+    user:
+      name: ${ui_username}
+      password: ${ui_password}

MtdrSpring/backend/target/classes/todolistapp-springboot.yaml

@@ -60,6 +60,14 @@ spec:
                   name: dbuser
                   key: dbpassword
                   optional: true
+            - name: ui_username
+              value: "%UI_USERNAME%"
+            - name: ui_password
+              valueFrom:
+                secretKeyRef:
+                  name: frontendadmin
+                  key: password
+                  optional: true
           volumeMounts:
             - name: creds
               mountPath: /mtdrworkshop/creds