Merge pull request #267 from dciangot/namespace_role

InterLinkAddress field for interlink config file generation
interTwin-eu · Jul 19, 2024 · 8b74353 · 8b74353
2 parents a7175b9 + 438ee8d
commit 8b74353
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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