From 32b29ee8d2a287244ae645daca968af2d0b3fd58 Mon Sep 17 00:00:00 2001
From: Tyson Lawrie <tlawrie@users.noreply.github.com>
Date: Thu, 7 Sep 2023 19:25:37 +1000
Subject: [PATCH] Remove legacy app prop

---
 .../kube/service/TektonServiceImpl.java       |  3 ---
 src/main/resources/application.properties     | 27 ++++++++-----------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/main/java/io/boomerang/kube/service/TektonServiceImpl.java b/src/main/java/io/boomerang/kube/service/TektonServiceImpl.java
index ed3eabe..654443c 100644
--- a/src/main/java/io/boomerang/kube/service/TektonServiceImpl.java
+++ b/src/main/java/io/boomerang/kube/service/TektonServiceImpl.java
@@ -71,9 +71,6 @@ public class TektonServiceImpl implements TektonService {
 
   @Value("${kube.image.pullSecret}")
   protected String kubeImagePullSecret;
-  
-  @Value("${kube.lifecycle.image}")
-  protected String kubeLifecycleImage;
 
   @Value("${kube.task.backOffLimit}")
   protected Integer kubeJobBackOffLimit;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b46dea2..fc2c81b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -3,16 +3,24 @@ spring.profiles.active=live
 
 info.version=@version.name@
 service.name=handler
+spring.application.name=${service.name}-${flow.environment}
 
 management.endpoints.web.base-path=/
 management.health.elasticsearch.enabled=false
 security.mode=none
 
-kube.lifecycle.image=boomerangio/worker-lifecycle:2.0.0
+proxy.enable=false
+proxy.host=
+proxy.port=
+proxy.ignore=
+
+springdoc.swagger-ui.path=/api/docs/swagger-ui
+springdoc.api-docs.path=/api/docs/spec
+springdoc.packages-to-scan=io.boomerang.controller
+
+# General Config 
 kube.image.pullPolicy=IfNotPresent
 kube.image.pullSecret=boomerang.registrykey
-
-# General Config
 kube.timeout.waitUntil=30
 
 # Workspace and Workflow Configuration
@@ -42,15 +50,6 @@ kube.resource.request.ephemeral-storage=2Gi
 kube.resource.limit.memory=16Gi
 kube.resource.request.memory=2Gi
 
-proxy.enable=false
-proxy.host=
-proxy.port=
-proxy.ignore=
-
-springdoc.swagger-ui.path=/api/docs/swagger-ui
-springdoc.api-docs.path=/api/docs/spec
-springdoc.packages-to-scan=io.boomerang.controller
-
 spring.mvc.async.request-timeout=600000
 flow.environment=
 flow.instance=bmrg-flow
@@ -59,10 +58,7 @@ flow.version=0.0.0
 
 #Opentracing activity
 opentracing.jaeger.enabled=true
-
 opentracing.jaeger.service-name=${service.name}-${flow.environment}
-spring.application.name=${service.name}-${flow.environment}
-
 opentracing.jaeger.udp-sender.host=bmrg-jaeger-dev-agent.bmrg-jaeger-dev
 opentracing.jaeger.udp-sender.port=6831
 opentracing.jaeger.http-sender.url=http://bmrg-jaeger-dev-collector.bmrg-jaeger-dev:14268/api/traces
@@ -70,7 +66,6 @@ opentracing.jaeger.remote-controlled-sampler.host=bmrg-jaeger-dev-agent.bmrg-jae
 opentracing.jaeger.remote-controlled-sampler.port=5778
 opentracing.jaeger.const-sampler.decision=true
 opentracing.jaeger.log-spans=true
-
 opentracing.jaeger.sampler-type=probabilistic
 opentracing.jaeger.sampler-param=1