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"]