From 438ee8d5e2bb8f2bceafeda4310aa2b4d4e0218a Mon Sep 17 00:00:00 2001
From: Diego Ciangottini <diego.ciangottini@pg.infn.it>
Date: Fri, 19 Jul 2024 10:00:41 +0200
Subject: [PATCH] InterLinkAddress field for interlink config file generation

Signed-off-by: Diego Ciangottini <diego.ciangottini@pg.infn.it>
---
 cmd/installer/templates/interlink-install.sh            | 2 +-
 docs/docs/tutorial-users/01-quick-start.md              | 6 +++---
 example/interlink-docker/interlink/InterLinkConfig.yaml | 2 +-
 example/interlink-docker/vk/InterLinkConfig.yaml        | 2 +-
 helm/interlink/templates/virtual-kubelet-config.yaml    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/installer/templates/interlink-install.sh b/cmd/installer/templates/interlink-install.sh
index 97bb8f66..0bff1517 100644
--- a/cmd/installer/templates/interlink-install.sh
+++ b/cmd/installer/templates/interlink-install.sh
@@ -27,7 +27,7 @@ install () {
   # set $HOME/.interlink/config/InterLinkConfig.yaml
 
   cat <<EOF >>$HOME/.interlink/config/InterLinkConfig.yaml
-InterlinkURL: "http://localhost"
+InterlinkAddress: "http://localhost"
 InterlinkPort: "30080"
 SidecarURL: "http://localhost"
 SidecarPort: "4000"
diff --git a/docs/docs/tutorial-users/01-quick-start.md b/docs/docs/tutorial-users/01-quick-start.md
index ab0725c9..d68c103b 100644
--- a/docs/docs/tutorial-users/01-quick-start.md
+++ b/docs/docs/tutorial-users/01-quick-start.md
@@ -45,11 +45,11 @@ You need to provide the interLink IP address that should be reachable from the k
 ```bash
 export INTERLINK_IP_ADDRESS=XXX.XX.X.XXX
 
-sed -i 's/InterlinkURL:.*/InterlinkURL: "http:\/\/'$INTERLINK_IP_ADDRESS'"/g'  vk/InterLinkConfig.yaml
+sed -i 's/InterlinkAddress:.*/InterlinkAddress: "http:\/\/'$INTERLINK_IP_ADDRESS'"/g'  vk/InterLinkConfig.yaml
 
-sed -i 's/InterlinkURL:.*/InterlinkURL: "http:\/\/'$INTERLINK_IP_ADDRESS'"/g'  interlink/InterLinkConfig.yaml | sed -i 's/SidecarURL:.*/SidecarURL: "http:\/\/'$INTERLINK_IP_ADDRESS'"/g' interlink/InterLinkConfig.yaml
+sed -i 's/InterlinkAddres:.*/InterlinkAddress: "http:\/\/'$INTERLINK_IP_ADDRESS'"/g'  interlink/InterLinkConfig.yaml | sed -i 's/SidecarURL:.*/SidecarURL: "http:\/\/'$INTERLINK_IP_ADDRESS'"/g' interlink/InterLinkConfig.yaml
 
-sed -i 's/InterlinkURL:.*/InterlinkURL: "http:\/\/'$INTERLINK_IP_ADDRESS'"/g'  interlink/sidecarConfig.yaml | sed -i 's/SidecarURL:.*/SidecarURL: "http:\/\/'$INTERLINK_IP_ADDRESS'"/g' interlink/sidecarConfig.yaml
+sed -i 's/InterlinkAddress:.*/InterlinkAddress: "http:\/\/'$INTERLINK_IP_ADDRESS'"/g'  interlink/sidecarConfig.yaml | sed -i 's/SidecarURL:.*/SidecarURL: "http:\/\/'$INTERLINK_IP_ADDRESS'"/g' interlink/sidecarConfig.yaml
 ```
 
 #### Deploy virtualKubelet
diff --git a/example/interlink-docker/interlink/InterLinkConfig.yaml b/example/interlink-docker/interlink/InterLinkConfig.yaml
index f199890d..6738ee3c 100644
--- a/example/interlink-docker/interlink/InterLinkConfig.yaml
+++ b/example/interlink-docker/interlink/InterLinkConfig.yaml
@@ -1,5 +1,5 @@
 VKTokenFile: "$HOME/interLink/token"
-InterlinkURL: "http://XXX.XXX.XXX.XXX"
+InterlinkAddress: "http://XXX.XXX.XXX.XXX"
 SidecarURL: "http://docker-sidecar"
 InterlinkPort: "3000"
 SidecarPort: "4000"
diff --git a/example/interlink-docker/vk/InterLinkConfig.yaml b/example/interlink-docker/vk/InterLinkConfig.yaml
index e1806b52..02f7f092 100644
--- a/example/interlink-docker/vk/InterLinkConfig.yaml
+++ b/example/interlink-docker/vk/InterLinkConfig.yaml
@@ -1,5 +1,5 @@
 VKTokenFile: "$HOME/interLink/token"
-InterlinkURL: "http://XXX.XXX.XXX.XXX"
+InterlinkAddress: "http://XXX.XXX.XXX.XXX"
 CommandPrefix: ""
 ExportPodData: true
 ServiceAccount: "interlink"
diff --git a/helm/interlink/templates/virtual-kubelet-config.yaml b/helm/interlink/templates/virtual-kubelet-config.yaml
index 4c32e3e9..cda7870f 100644
--- a/helm/interlink/templates/virtual-kubelet-config.yaml
+++ b/helm/interlink/templates/virtual-kubelet-config.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   InterLinkConfig.yaml: |
-    InterlinkURL: {{ .Values.interlink.URL }}
+    InterlinkAddress: {{ .Values.interlink.URL }}
     InterlinkPort: {{ .Values.interlink.port }}
     ExportPodData: true
     VerboseLogging: true