Fixup deployments

Author: phrocker

.azure.env

@@ -4,7 +4,7 @@ SENTRIUS_KEYCLOAK_VERSION=1.1.14
 SENTRIUS_AGENT_VERSION=1.1.23
 SENTRIUS_AI_AGENT_VERSION=1.1.4
 LLMPROXY_VERSION=1.1.4
-LAUNCHER_VERSION=1.1.4
+LAUNCHER_VERSION=1.1.5
 AGENTPROXY_VERSION=1.1.5
 SSHPROXY_VERSION=1.1.4
 RDPPROXY_VERSION=1.1.4

agent-launcher/src/main/java/io/sentrius/agent/launcher/service/PodLauncherService.java

@@ -164,8 +164,11 @@ public V1Pod launchAgentPod(AgentRegistrationDTO agent) throws Exception {
         if (agentRegistry != null) {
             if ("local".equalsIgnoreCase(agentRegistry)) {
                 myAgentRegistry = "";
-            } else if (!agentRegistry.endsWith("/")) {
-                myAgentRegistry += "/";
+            } else {
+                myAgentRegistry = agentRegistry;
+                if (!myAgentRegistry.endsWith("/")) {
+                    myAgentRegistry += "/";
+                }
             }
         }
         String agentId = agent.getAgentName().toLowerCase();

ops-scripts/azure/deploy-helm.sh

@@ -499,7 +499,7 @@ helm upgrade --install sentrius-agents ./sentrius-chart-launcher --namespace ${T
     --set ssh.image.repository="${AZURE_REGISTRY}/sentrius-ssh" \
     --set ssh.image.pullPolicy="IfNotPresent" \
     --set ssh.image.tag=${SENTRIUS_SSH_VERSION} \
-    --set sentriusaiagent.image.repository="${AZURE_REGISTRY}/sentrius-ai-agent" \
+    --set sentriusaiagent.image.repository="${AZURE_REGISTRY}/" \
     --set sentriusaiagent.image.pullPolicy="IfNotPresent" \
     --set sentriusaiagent.image.tag=${SENTRIUS_AI_AGENT_VERSION} \
     --set launcherservice.image.repository="${AZURE_REGISTRY}/sentrius-launcher-service" \

sentrius-chart-launcher/templates/configmap.yaml

@@ -100,8 +100,8 @@ data:
     spring.kafka.properties.metadata.max.age.ms=10000
     spring.kafka.properties.retry.backoff.ms=1000
 
-    sentrius.agent.registry=local
-    sentrius.agent.registry.version=latest
+    sentrius.agent.registry={{ .Values.sentriusaiagent.image.repository }}
+    sentrius.agent.registry.version={{ .Values.sentriusaiagent.image.tag }}
     sentrius.agent.namespace={{ .Values.tenant }}
   agent.properties: |
     spring.main.web-application-type=servlet

sentrius-chart-launcher/values.yaml

@@ -101,6 +101,7 @@ sentriusagent:
   image:
     repository: sentrius-agent
     pullPolicy: IfNotPresent
+    tag: latest
   port: 8080
   oauth2:
     client_id: java-agents
@@ -127,8 +128,9 @@ sentriusaiagent:
     type: NodePort
     nodePort: 30085
   image:
-    repository: sentrius-ai-agent
+    repository: sentrius-launchable-agent
     pullPolicy: IfNotPresent
+    tag: latest
   port: 8080
   oauth2:
     client_id: java-agents