Skip to content

Commit

Permalink
Remove legacy app prop
Browse files Browse the repository at this point in the history
  • Loading branch information
tlawrie committed Sep 7, 2023
1 parent 248c294 commit 32b29ee
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
27 changes: 11 additions & 16 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -59,18 +58,14 @@ 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
opentracing.jaeger.remote-controlled-sampler.host=bmrg-jaeger-dev-agent.bmrg-jaeger-dev
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

Expand Down

0 comments on commit 32b29ee

Please sign in to comment.