From 0079e88fe9fe10689b70b28530eb4c70f5568576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfredo=20Espa=C3=B1a?= <alfespa17@gmail.com>
Date: Mon, 18 Mar 2024 18:02:43 -0600
Subject: [PATCH] Allow to deploy executor as self hosted agent (#104)

* Allow to deploy executor as self hosted agent
---
 charts/terrakube/Chart.yaml                      | 2 +-
 charts/terrakube/templates/secrets-executor.yaml | 2 +-
 charts/terrakube/values.schema.json              | 4 ++++
 charts/terrakube/values.yaml                     | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/charts/terrakube/Chart.yaml b/charts/terrakube/Chart.yaml
index 655883a..f4388af 100644
--- a/charts/terrakube/Chart.yaml
+++ b/charts/terrakube/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.15.2
+version: 3.16.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/terrakube/templates/secrets-executor.yaml b/charts/terrakube/templates/secrets-executor.yaml
index dbbd687..dc19f79 100644
--- a/charts/terrakube/templates/secrets-executor.yaml
+++ b/charts/terrakube/templates/secrets-executor.yaml
@@ -6,7 +6,7 @@ metadata:
 type: Opaque
 stringData:
   # General Settings
-  AzBuilderApiUrl: 'http://terrakube-api-service:8080'
+  AzBuilderApiUrl: '{{ .Values.executor.apiServiceUrl }}'
   InternalSecret: '{{ .Values.security.internalSecret | b64enc }}'
 
   ExecutorFlagBatch: 'false'
diff --git a/charts/terrakube/values.schema.json b/charts/terrakube/values.schema.json
index 7ed8416..ed128ca 100644
--- a/charts/terrakube/values.schema.json
+++ b/charts/terrakube/values.schema.json
@@ -272,6 +272,10 @@
             "description": "Executor Docker Version",
             "type": "string"
           },
+          "apiServiceUrl": {
+            "description": "Terrakube service where the executor will connect",
+            "type": "string"
+          },
           "replicaCount": {
             "description": "Replica count for API",
             "type": "string"
diff --git a/charts/terrakube/values.yaml b/charts/terrakube/values.yaml
index 61fa347..8e4b938 100644
--- a/charts/terrakube/values.yaml
+++ b/charts/terrakube/values.yaml
@@ -210,6 +210,7 @@ executor:
   serviceAccountName: ""
   resources: {}
   podLabels: {}
+  apiServiceUrl: "http://terrakube-api-service:8080"
   properties:
     toolsRepository: "https://github.com/AzBuilder/terrakube-extensions"
     toolsBranch: "main"