From f273fb8763351c0492772f2e991a21256951e240 Mon Sep 17 00:00:00 2001
From: lorenz <stu203404@mail.uni-kiel.de>
Date: Sun, 28 Mar 2021 21:17:57 +0200
Subject: [PATCH] Change helm to use default values
---
.../theodolite-operator/templates/thedolite-operator.yaml | 6 +-----
execution/helm/theodolite-operator/values.yaml | 4 ++--
theodolite-quarkus/src/main/docker/Dockerfile.jvm | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/execution/helm/theodolite-operator/templates/thedolite-operator.yaml b/execution/helm/theodolite-operator/templates/thedolite-operator.yaml
index 6ffeefd82..29feed5ad 100644
--- a/execution/helm/theodolite-operator/templates/thedolite-operator.yaml
+++ b/execution/helm/theodolite-operator/templates/thedolite-operator.yaml
@@ -23,11 +23,7 @@ spec:
value: {{ .Values.operator.namespace}}
- name: lag-analysis
image: benediktwetzel/lag-analysis
- env:
- - name: PORT
- value: "8080"
ports:
- - containerPort: 8080
+ - containerPort: 80
name: analysis
-
{{- end }}
diff --git a/execution/helm/theodolite-operator/values.yaml b/execution/helm/theodolite-operator/values.yaml
index 80dfc235c..f259913ef 100644
--- a/execution/helm/theodolite-operator/values.yaml
+++ b/execution/helm/theodolite-operator/values.yaml
@@ -15,5 +15,5 @@ rbac:
create: true
serviceAnalysis:
- type: NodePort
- port: 8080
+ type: ClusterIP
+ port: 80
diff --git a/theodolite-quarkus/src/main/docker/Dockerfile.jvm b/theodolite-quarkus/src/main/docker/Dockerfile.jvm
index 232ab0397..6733d5d44 100644
--- a/theodolite-quarkus/src/main/docker/Dockerfile.jvm
+++ b/theodolite-quarkus/src/main/docker/Dockerfile.jvm
@@ -41,7 +41,7 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
&& echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
-ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dquarkus.package.main-class=TheodoliteOperator"
+ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
COPY build/lib/* /deployments/lib/
COPY build/*-runner.jar /deployments/app.jar
COPY config/ /deployments/config/
--
GitLab