Merge remote-tracking branch 'origin/main'

Author: paulparkinson

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/Dockerfile

@@ -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/build.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/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 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/k8s/createSecretFromWalletMac.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/k8s/createTLSSecret.sh

@@ -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

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

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: oraclejavaai
+spec:
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 8080
+      # nodePort: 32462
+  selector:
+    app: oraclejavaai
+  type: LoadBalancer

java-ai/k8s/java-ai-services.yaml

@@ -32,10 +32,15 @@
 			<artifactId>json</artifactId>
 			<version>20231013</version>
 		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.8.0</version>
+		</dependency>
 		<dependency>
 			<groupId>com.oracle.cloud.spring</groupId>
 			<artifactId>spring-cloud-oci-starter</artifactId>
-			<version>1.0.0</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.oracle.oci.sdk</groupId>