Skip to content

Commit a7bb209

Browse files
phrockerphrocker
committed
commit
1 parent 5a7214f commit a7bb209

File tree

11 files changed

+231
-192
lines changed

11 files changed

+231
-192
lines changed

‎.local.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ SENTRIUS_AI_AGENT_VERSION=1.1.263
66
LLMPROXY_VERSION=1.0.78
77
LAUNCHER_VERSION=1.0.82
88
AGENTPROXY_VERSION=1.0.85
9-
SSHPROXY_VERSION=1.0.3
9+
SSHPROXY_VERSION=1.0.6

‎.local.env.bak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ SENTRIUS_AI_AGENT_VERSION=1.1.263
66
LLMPROXY_VERSION=1.0.78
77
LAUNCHER_VERSION=1.0.82
88
AGENTPROXY_VERSION=1.0.85
9-
SSHPROXY_VERSION=1.0.3
9+
SSHPROXY_VERSION=1.0.6

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,11 +484,12 @@
484484
<dependenciesToScan>
485485
<dependency>org.junit.jupiter</dependency>
486486
</dependenciesToScan>
487+
<!--
487488
<providers>
488489
<provider>
489490
<name>junit-platform</name>
490491
</provider>
491-
</providers>
492+
</providers> -->
492493
</configuration>
493494
</plugin>
494495
<plugin>

‎sentrius-chart/templates/configmap.yaml‎

Lines changed: 67 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -478,59 +478,70 @@ data:
478478
twopartyapproval.require.explanation.LOCKING_SYSTEMS=false
479479
canApproveOwnJITs=false
480480
yamlConfiguration=/app/demoInstaller.yml
481-
sshproxy-application.properties: |
482-
keystore.file=sso.jceks
483-
keystore.password=${KEYSTORE_PASSWORD}
484-
keystore.alias=KEYBOX-ENCRYPTION_KEY
485-
spring.thymeleaf.enabled=true
486-
spring.freemarker.enabled=false
487-
management.metrics.enable.system.processor={{ .Values.metrics.enabled }}
488-
spring.autoconfigure.exclude={{ .Values.metrics.class.exclusion }}
489-
#flyway configuration
490-
spring.main.web-application-type=reactive
491-
spring.flyway.enabled=false
492-
logging.level.org.springframework.web=INFO
493-
logging.level.org.springframework.security=INFO
494-
logging.level.io.sentrius=DEBUG
495-
logging.level.org.thymeleaf=INFO
496-
spring.thymeleaf.servlet.produce-partial-output-while-processing=false
497-
spring.servlet.multipart.enabled=true
498-
spring.servlet.multipart.max-file-size=10MB
499-
spring.servlet.multipart.max-request-size=10MB
500-
server.error.whitelabel.enabled=false
501-
dynamic.properties.path=/config/dynamic.properties
502-
keycloak.realm=sentrius
503-
keycloak.base-url={{ .Values.keycloakInternalDomain | default .Values.keycloakDomain }}
504-
agent.api.url={{ .Values.sentriusDomain }}
505-
# Keycloak configuration
506-
spring.security.oauth2.client.registration.keycloak.client-id={{ .Values.agentproxy.oauth2.client_id }}
507-
spring.security.oauth2.client.registration.keycloak.client-secret=${KEYCLOAK_CLIENT_SECRET}
508-
spring.security.oauth2.client.registration.keycloak.authorization-grant-type={{ .Values.sentriusagent.oauth2.authorization_grant_type }}
509-
#spring.security.oauth2.client.registration.keycloak.redirect-uri={{ .Values.sentriusDomain }}/login/oauth2/code/keycloak
510-
#spring.security.oauth2.client.registration.keycloak.scope={{ .Values.sentriusagent.oauth2.scope }}
511-
spring.security.oauth2.resourceserver.jwt.issuer-uri={{ .Values.keycloakInternalDomain | default .Values.keycloakDomain }}/realms/sentrius
512-
spring.security.oauth2.client.provider.keycloak.issuer-uri={{ .Values.keycloakInternalDomain | default .Values.keycloakDomain }}/realms/sentrius
513-
# OTEL settings
514-
otel.traces.exporter=otlp
515-
otel.metrics.exporter=none
516-
otel.logs.exporter=none
517-
otel.exporter.otlp.endpoint=http://sentrius-jaeger:4317
518-
otel.resource.attributes.service.name=integration-proxy
519-
otel.traces.sampler=always_on
520-
otel.exporter.otlp.timeout=10s
521-
otel.exporter.otlp.protocol=grpc
522-
provenance.kafka.topic=sentrius-provenance
523-
# Serialization
524-
spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
525-
spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
526-
spring.kafka.producer.properties.spring.json.trusted.packages=io.sentrius.*
527-
# Reliability
528-
spring.kafka.producer.retries=5
529-
spring.kafka.producer.acks=all
530-
# Timeout tuning
531-
spring.kafka.producer.request-timeout-ms=10000
532-
spring.kafka.producer.delivery-timeout-ms=30000
533-
spring.kafka.properties.max.block.ms=500
534-
spring.kafka.properties.metadata.max.age.ms=10000
535-
spring.kafka.properties.retry.backoff.ms=1000
536-
spring.kafka.bootstrap-servers=sentrius-kafka:9092
481+
sshproxy-application.properties: |
482+
keystore.file=sso.jceks
483+
keystore.password=${KEYSTORE_PASSWORD}
484+
keystore.alias=KEYBOX-ENCRYPTION_KEY
485+
spring.thymeleaf.enabled=true
486+
spring.freemarker.enabled=false
487+
management.metrics.enable.system.processor={{ .Values.metrics.enabled }}
488+
spring.autoconfigure.exclude={{ .Values.metrics.class.exclusion }}
489+
#flyway configuration
490+
spring.main.web-application-type=reactive
491+
spring.flyway.enabled=false
492+
logging.level.org.springframework.web=INFO
493+
logging.level.org.springframework.security=INFO
494+
logging.level.io.sentrius=DEBUG
495+
logging.level.org.thymeleaf=INFO
496+
spring.main.web-application-type=servlet
497+
spring.thymeleaf.servlet.produce-partial-output-while-processing=false
498+
spring.servlet.multipart.enabled=true
499+
spring.servlet.multipart.max-file-size=10MB
500+
spring.servlet.multipart.max-request-size=10MB
501+
server.error.whitelabel.enabled=false
502+
dynamic.properties.path=/config/dynamic.properties
503+
keycloak.realm=sentrius
504+
keycloak.base-url={{ .Values.keycloakInternalDomain | default .Values.keycloakDomain }}
505+
agent.api.url={{ .Values.sentriusDomain }}
506+
# Keycloak configuration
507+
spring.security.oauth2.client.registration.keycloak.client-id={{ .Values.agentproxy.oauth2.client_id }}
508+
spring.security.oauth2.client.registration.keycloak.client-secret=${KEYCLOAK_CLIENT_SECRET}
509+
spring.security.oauth2.client.registration.keycloak.authorization-grant-type={{ .Values.sentriusagent.oauth2.authorization_grant_type }}
510+
#spring.security.oauth2.client.registration.keycloak.redirect-uri={{ .Values.sentriusDomain }}/login/oauth2/code/keycloak
511+
#spring.security.oauth2.client.registration.keycloak.scope={{ .Values.sentriusagent.oauth2.scope }}
512+
spring.security.oauth2.resourceserver.jwt.issuer-uri={{ .Values.keycloakInternalDomain | default .Values.keycloakDomain }}/realms/sentrius
513+
spring.security.oauth2.client.provider.keycloak.issuer-uri={{ .Values.keycloakInternalDomain | default .Values.keycloakDomain }}/realms/sentrius
514+
# OTEL settings
515+
otel.traces.exporter=otlp
516+
otel.metrics.exporter=none
517+
otel.logs.exporter=none
518+
otel.exporter.otlp.endpoint=http://sentrius-jaeger:4317
519+
otel.resource.attributes.service.name=integration-proxy
520+
otel.traces.sampler=always_on
521+
otel.exporter.otlp.timeout=10s
522+
otel.exporter.otlp.protocol=grpc
523+
provenance.kafka.topic=sentrius-provenance
524+
# Serialization
525+
spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
526+
spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
527+
spring.kafka.producer.properties.spring.json.trusted.packages=io.sentrius.*
528+
# Reliability
529+
spring.kafka.producer.retries=5
530+
spring.kafka.producer.acks=all
531+
# Timeout tuning
532+
spring.kafka.producer.request-timeout-ms=10000
533+
spring.kafka.producer.delivery-timeout-ms=30000
534+
spring.kafka.properties.max.block.ms=500
535+
spring.kafka.properties.metadata.max.age.ms=10000
536+
spring.kafka.properties.retry.backoff.ms=1000
537+
spring.kafka.bootstrap-servers=sentrius-kafka:9092
538+
# SSH Proxy settings
539+
sentrius.ssh-proxy.enabled=true
540+
sentrius.ssh-proxy.port=2222
541+
sentrius.ssh-proxy.host-key-path=/tmp/ssh-proxy-hostkey.ser
542+
sentrius.ssh-proxy.max-concurrent-sessions=100
543+
management.endpoints.web.exposure.include=health
544+
management.endpoint.health.show-details=always
545+
spring.datasource.url=jdbc:postgresql://sentrius-postgres:5432/sentrius
546+
spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
547+
spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}

‎sentrius-chart/templates/ssh-proxy-deployment.yaml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
ports:
2323
- containerPort: {{ .Values.sshproxy.port }}
2424
name: ssh
25-
- containerPort: 8090
25+
- containerPort: 8080
2626
name: http
2727
env:
2828
- name: SENTRIUS_SSH_PROXY_ENABLED
@@ -35,8 +35,26 @@ spec:
3535
value: "{{ .Values.sshproxy.connection.keepAliveInterval }}"
3636
- name: SENTRIUS_SSH_PROXY_CONNECTION_MAX_RETRIES
3737
value: "{{ .Values.sshproxy.connection.maxRetries }}"
38+
- name: SPRING_DATASOURCE_USERNAME
39+
valueFrom:
40+
secretKeyRef:
41+
name: {{ .Release.Name }}-db-secret
42+
key: db-username
43+
- name: SPRING_DATASOURCE_PASSWORD
44+
valueFrom:
45+
secretKeyRef:
46+
name: {{ .Release.Name }}-db-secret
47+
key: db-password
48+
- name: KEYSTORE_PASSWORD
49+
valueFrom:
50+
secretKeyRef:
51+
name: {{ .Release.Name }}-db-secret
52+
key: keystore-password
3853
resources:
3954
{{- toYaml .Values.sshproxy.resources | nindent 12 }}
55+
volumeMounts:
56+
- name: config-volume
57+
mountPath: /config
4058
livenessProbe:
4159
httpGet:
4260
path: /actuator/health
@@ -48,4 +66,8 @@ spec:
4866
path: /actuator/health
4967
port: http
5068
initialDelaySeconds: 5
51-
periodSeconds: 5
69+
periodSeconds: 5
70+
volumes:
71+
- name: config-volume
72+
configMap:
73+
name: {{ .Release.Name }}-config

‎sentrius-chart/templates/ssh-proxy-service.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,5 @@ spec:
1515
{{- if and (eq .Values.sshproxy.serviceType "NodePort") .Values.sshproxy.nodePort }}
1616
nodePort: {{ .Values.sshproxy.nodePort }}
1717
{{- end }}
18-
- port: 8090
19-
targetPort: 8090
20-
protocol: TCP
21-
name: http
2218
selector:
2319
app: sentrius-ssh-proxy

‎sentrius-chart/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ sshproxy:
375375
tag: tag
376376
pullPolicy: IfNotPresent
377377
port: 2222
378-
serviceType: ClusterIP
378+
serviceType: NodePort
379379
nodePort: 30022 # Only used if serviceType is NodePort
380380
resources: {}
381381
connection:

0 commit comments

Comments
 (0)