Merge remote-tracking branch 'origin/main'

Author: paulparkinson

java-ai-before-aiholo/Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:17-alpine
+#docker.io/library/openjdk:17-oracle
+
+ADD target/oracleai-0.0.1-SNAPSHOT.jar /usr/share/oracleai/oracleai-0.0.1-SNAPSHOT.jar
+ENTRYPOINT ["java", "-jar", "/usr/share/oracleai/oracleai-0.0.1-SNAPSHOT.jar"]

java-ai-before-aiholo/build.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+#The following is temporary until release is available in maven and only required to be called once...
+#mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file -Dfile=lib/oci-java-sdk-generativeai-3.25.1-preview1-20230906.204234-1.jar
+
+mvn clean package

java-ai-before-aiholo/build0.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+IMAGE_NAME=podsofkon
+#IMAGE_VERSION=latest
+IMAGE_VERSION=sustainableaijava
+#DOCKER_REGISTRY=us-ashburn-1.ocir.io/oradbclouducm/gd74087885
+DOCKER_REGISTRY=us-ashburn-1.ocir.io/oradbclouducm/podsofkon
+
+export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
+export IMAGE_VERSION=$IMAGE_VERSION
+
+mvn clean package
+
+#docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE .
+podman build -t=$IMAGE .
+#docker buildx build --platform=linux/amd64 -t=$IMAGE .
+
+#docker push --platform linux/amd64  "$IMAGE"
+podman push "$IMAGE"

java-ai-before-aiholo/build_and_run.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export `cat env.properties`
+#export `cat ~/Downloads/env.properties`
+
+mvn clean package ; java -jar target/oracleai-0.0.1-SNAPSHOT.jar

java-ai-before-aiholo/build_docker.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+export IMAGE_NAME=oracleai
+export IMAGE_VERSION=0.1
+
+
+if [ -z "$DOCKER_REGISTRY" ]; then
+    echo "DOCKER_REGISTRY not set. Will set it to 'test"
+  export DOCKER_REGISTRY=test
+fi
+
+export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
+
+docker build -t=$IMAGE .
+
+#docker push "$IMAGE"
+#if [  $? -eq 0 ]; then
+#    docker rmi "$IMAGE"
+#fi
+

java-ai-before-aiholo/env.properties

@@ -0,0 +1,10 @@
+OCICONFIG_FILE=~/.oci/config
+OCICONFIG_PROFILE=DEFAULT
+COMPARTMENT_ID=ocid1.compartment.oc1..mycompartmentvalue
+OBJECTSTORAGE_NAMESPACE=myobjectstorenamespacename
+OBJECTSTORAGE_BUCKETNAME=myobjectstorebucketname
+ORDS_ENDPOINT_URL=https://myordsendpointurl
+OCI_VISION_SERVICE_ENDPOINT=https://vision.aiservice.myregion.oci.oraclecloud.com
+OCI_SPEECH_SERVICE_ENDPOINT=https://speech.aiservice.myregion.oci.oraclecloud.com
+OCI_GENAI_SERVICE_ENDPOINT=https://inference.generativeai.us-chicago-1.oci.oraclecloud.com
+OPENAI_KEY=mykeyfordalleifused

java-ai-before-aiholo/k8s/createSecretFromWallet.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+#simply copy this file to and run it from your wallet dir...
+if kubectl apply -f - ; then
+    echo "secret applied for wallet."
+else
+    echo "Error: Failure to create ragdb-wallet-secret."
+fi <<!
+apiVersion: v1
+data:
+  README: $(base64 -w0 README)
+  cwallet.sso: $(base64 -w0 cwallet.sso)
+  ewallet.p12: $(base64 -w0 ewallet.p12)
+  keystore.jks: $(base64 -w0 keystore.jks)
+  ojdbc.properties: $(base64 -w0 ojdbc.properties)
+  sqlnet.ora: $(base64 -w0 sqlnet.ora)
+  tnsnames.ora: $(base64 -w0 tnsnames.ora)
+  truststore.jks: $(base64 -w0 truststore.jks)
+kind: Secret
+metadata:
+  name: ragdb-wallet-secret
+!
+

java-ai-before-aiholo/k8s/createSecretFromWalletMac.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Simply copy this file to and run it from your wallet dir...
+if kubectl apply -f - ; then
+    echo "secret applied for wallet in the msdataworkshop namespace."
+else
+    echo "Error: Failure to create ragdb-wallet-secret."
+fi <<!
+apiVersion: v1
+data:
+  README: $(base64 -i ./README)
+  cwallet.sso: $(base64 -i ./cwallet.sso)
+  ewallet.p12: $(base64 -i ./ewallet.p12)
+  keystore.jks: $(base64 -i ./keystore.jks)
+  ojdbc.properties: $(base64 -i ./ojdbc.properties)
+  sqlnet.ora: $(base64 -i ./sqlnet.ora)
+  tnsnames.ora: $(base64 -i ./tnsnames.ora)
+  truststore.jks: $(base64 -i ./truststore.jks)
+kind: Secret
+metadata:
+  name: ragdb-wallet-secret
+  namespace: msdataworkshop
+!

java-ai-before-aiholo/k8s/createTLSSecret.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+kubectl create secret tls ssl-certificate-secret --key $MY_STATE/tls/tls.key --cert $MY_STATE/tls/tls.crt -n

java-ai-before-aiholo/k8s/java-ai-deployment.yaml

@@ -0,0 +1,49 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: oraclejavaai
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: oraclejavaai
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        app: oraclejavaai
+    spec:
+      volumes:
+        - name: creds
+          secret:
+            secretName: ragdb-wallet-secret
+            defaultMode: 420
+      containers:
+        - name: oraclejavaai
+          image: us-ashburn-1.ocir.io/oradbclouducm/podsofkon/podsofkon:sustainableai
+#          image: us-ashburn-1.ocir.io/oradbclouducm/oraclejavaai/oraclejavaai:0.2
+#          image: us-ashburn-1.ocir.io/oradbclouducm/gd74087885/xr-admin:0.1
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          env:
+            - name: LOG_LEVEL
+              value: DEBUG
+            - name: server_port
+              value: '8080'
+            - name: spring.datasource.username
+              value: admin
+            - name: spring.datasource.url
+              value: jdbc:oracle:thin:@ragdb_tp?TNS_ADMIN=/oraclejavaai/creds
+            - name: spring.datasource.password
+              value: Welcome123456
+          resources: {}
+          volumeMounts:
+            - name: creds
+              mountPath: /oraclejavaai/creds
+          imagePullPolicy: Always
+      restartPolicy: Always
+      imagePullSecrets:
+        - name: regcred
+      schedulerName: default-scheduler