From 98421c8aaa408323d94c124249c2822d42ee1120 Mon Sep 17 00:00:00 2001
From: Davi Arnaut <davi.arnaut@acryl.io>
Date: Wed, 2 Oct 2024 10:04:23 -0700
Subject: [PATCH] Rename worker_id to executor_id

---
 charts/datahub-executor-worker/Chart.yaml              | 2 +-
 charts/datahub-executor-worker/README.md               | 4 ++--
 charts/datahub-executor-worker/templates/workload.yaml | 4 +++-
 charts/datahub-executor-worker/values.yaml             | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/charts/datahub-executor-worker/Chart.yaml b/charts/datahub-executor-worker/Chart.yaml
index d77e678..d507527 100644
--- a/charts/datahub-executor-worker/Chart.yaml
+++ b/charts/datahub-executor-worker/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: datahub-executor-worker
 description: A Helm chart for datahub-executor-worker
 type: application
-version: 0.0.8
+version: 0.0.9
 appVersion: 0.0.1
 maintainers:
   - name: DataHub
diff --git a/charts/datahub-executor-worker/README.md b/charts/datahub-executor-worker/README.md
index 1c82a55..1268d91 100644
--- a/charts/datahub-executor-worker/README.md
+++ b/charts/datahub-executor-worker/README.md
@@ -4,9 +4,9 @@
 # Create secret object with GMS access token. Note that secret name and key must match those in values file
 $ kubectl create secret generic datahub-access-token-secret --from-literal=datahub-access-token-secret-key=<DATAHUB-ACCESS-TOKEN>
 
-# Deploy executor with worker ID "remote" and GMS URL "https://company.acryl.io/gms"
+# Deploy executor with executor ID "remote" and GMS URL "https://company.acryl.io/gms"
 $ helm install \
-  --set global.datahub.executor.worker_id="remote" \
+  --set global.datahub.executor.executor_id="remote" \
   --set global.datahub.gms.url="https://company.acryl.io/gms" \
     default ./charts/datahub-executor-worker
 ```
diff --git a/charts/datahub-executor-worker/templates/workload.yaml b/charts/datahub-executor-worker/templates/workload.yaml
index 75864aa..5e2d5ea 100644
--- a/charts/datahub-executor-worker/templates/workload.yaml
+++ b/charts/datahub-executor-worker/templates/workload.yaml
@@ -134,8 +134,10 @@ spec:
                   key: {{ ((.Values.global.datahub).gms).secretKey }}
             - name: DATAHUB_EXECUTOR_MODE
               value: "worker"
+            {{- with .Values.global.datahub.executor }}
             - name: DATAHUB_EXECUTOR_WORKER_ID
-              value: {{ .Values.global.datahub.executor.worker_id | quote }}
+              value: {{ .executor_id | default .worker_id | quote }}
+            {{- end }}
             - name: DATAHUB_EXECUTOR_INGESTION_MAX_WORKERS
               value: {{ .Values.global.datahub.executor.ingestions.max_workers | quote }}
             - name: DATAHUB_EXECUTOR_INGESTION_SIGNAL_POLL_INTERVAL
diff --git a/charts/datahub-executor-worker/values.yaml b/charts/datahub-executor-worker/values.yaml
index 102a5ba..782f47d 100644
--- a/charts/datahub-executor-worker/values.yaml
+++ b/charts/datahub-executor-worker/values.yaml
@@ -5,7 +5,7 @@ global:
       secretKey: datahub-access-token-secret-key
       url: https://datahub.acryl.io/gms
     executor:
-      worker_id: "remote"
+      executor_id: "remote"
       ingestions:
         max_workers: 4
         signal_poll_interval: 2