From ef011f6ad10fb8a682012a77174bca477e846fe1 Mon Sep 17 00:00:00 2001
From: Rudi Schlatte <rudi@ifi.uio.no>
Date: Thu, 25 Jan 2024 13:39:25 +0100
Subject: [PATCH] Deploy optimiser-controller, not spring-boot-demo

Turn on logging for easier build failure diagnostics

Change-Id: Iede779d2aeb980f9f5b51ece51e57bb2a42f64d7
---
 .../templates/deployment.yaml                    | 16 ++++++++--------
 charts/nebulous-optimiser-controller/values.yaml |  4 ++--
 optimiser-controller/Dockerfile                  |  7 ++-----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/charts/nebulous-optimiser-controller/templates/deployment.yaml b/charts/nebulous-optimiser-controller/templates/deployment.yaml
index dbbd068..5b0b80e 100644
--- a/charts/nebulous-optimiser-controller/templates/deployment.yaml
+++ b/charts/nebulous-optimiser-controller/templates/deployment.yaml
@@ -51,14 +51,14 @@ spec:
                 secretKeyRef:
                   name: {{ include "nebulous-optimiser-controller.fullname" . }}-secrets
                   key: ACTIVEMQ_PASSWORD
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
+          # livenessProbe:
+          #   httpGet:
+          #     path: /
+          #     port: http
+          # readinessProbe:
+          #   httpGet:
+          #     path: /
+          #     port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/charts/nebulous-optimiser-controller/values.yaml b/charts/nebulous-optimiser-controller/values.yaml
index d512927..e759449 100644
--- a/charts/nebulous-optimiser-controller/values.yaml
+++ b/charts/nebulous-optimiser-controller/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: "quay.io/nebulous/optimiser-controller-java-spring-boot-demo"
+  repository: "quay.io/nebulous/optimiser-controller"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -85,7 +85,7 @@ debug:
   LOGDIR: /tmp/nebulous
 
 activemq:
-  ACTIVEMQ_HOST: activemq
+  ACTIVEMQ_HOST: nebulous-activemq
   ACTIVEMQ_PORT: 5672
   ACTIVEMQ_USER: admin
 
diff --git a/optimiser-controller/Dockerfile b/optimiser-controller/Dockerfile
index 1acaa46..0e85ef5 100644
--- a/optimiser-controller/Dockerfile
+++ b/optimiser-controller/Dockerfile
@@ -4,14 +4,11 @@
 FROM docker.io/library/gradle:8-jdk17-alpine AS build
 COPY . /home/optimiser-controller
 WORKDIR /home/optimiser-controller
-RUN gradle --no-daemon clean build
+RUN gradle --no-daemon -Dorg.gradle.logging.level=info clean build
 
 #
 # Package stage
 #
 FROM docker.io/library/eclipse-temurin:17-jre
 COPY --from=build /home/optimiser-controller/dist/optimiser-controller-all.jar /usr/local/lib/optimiser-controller-all.jar
-# When running the image without arguments, print help for now.  Adjust this
-# once we start listening to MQTT messages from the NebulOuS GUI.
-CMD ["--help"]
-ENTRYPOINT ["java","-jar","/usr/local/lib/optimiser-controller-all.jar"]
+ENTRYPOINT ["java","-jar","/usr/local/lib/optimiser-controller-all.jar", "-vv"]