From 2c493b47fb44c18a9df62eec18600b178b4b7c0c Mon Sep 17 00:00:00 2001 From: Mitchell M Date: Sat, 10 Dec 2022 08:01:30 +1100 Subject: [PATCH 1/2] Avoid subshell for variable outputs Signed-off-by: Mitchell Macpherson --- docs/k8s/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/k8s/Makefile b/docs/k8s/Makefile index 826a68b65..e47548276 100644 --- a/docs/k8s/Makefile +++ b/docs/k8s/Makefile @@ -7,22 +7,22 @@ SA_NAME ?= tailscale TS_KUBE_SECRET ?= tailscale rbac: - @sed -e "s;{{TS_KUBE_SECRET}};$(TS_KUBE_SECRET);g" role.yaml | kubectl apply -f - - @sed -e "s;{{SA_NAME}};$(SA_NAME);g" rolebinding.yaml | kubectl apply -f - - @sed -e "s;{{SA_NAME}};$(SA_NAME);g" sa.yaml | kubectl apply -f - + @sed -e "s;{{TS_KUBE_SECRET}};$TS_KUBE_SECRET;g" role.yaml | kubectl apply -f - + @sed -e "s;{{SA_NAME}};$SA_NAME;g" rolebinding.yaml | kubectl apply -f - + @sed -e "s;{{SA_NAME}};$SA_NAME;g" sa.yaml | kubectl apply -f - sidecar: @kubectl delete -f sidecar.yaml --ignore-not-found --grace-period=0 - @sed -e "s;{{TS_KUBE_SECRET}};$(TS_KUBE_SECRET);g" sidecar.yaml | sed -e "s;{{SA_NAME}};$(SA_NAME);g" | kubectl create -f- + @sed -e "s;{{TS_KUBE_SECRET}};$TS_KUBE_SECRET;g" sidecar.yaml | sed -e "s;{{SA_NAME}};$SA_NAME;g" | kubectl create -f- userspace-sidecar: @kubectl delete -f userspace-sidecar.yaml --ignore-not-found --grace-period=0 - @sed -e "s;{{TS_KUBE_SECRET}};$(TS_KUBE_SECRET);g" userspace-sidecar.yaml | sed -e "s;{{SA_NAME}};$(SA_NAME);g" | kubectl create -f- + @sed -e "s;{{TS_KUBE_SECRET}};$TS_KUBE_SECRET;g" userspace-sidecar.yaml | sed -e "s;{{SA_NAME}};$SA_NAME;g" | kubectl create -f- proxy: kubectl delete -f proxy.yaml --ignore-not-found --grace-period=0 - sed -e "s;{{TS_KUBE_SECRET}};$(TS_KUBE_SECRET);g" proxy.yaml | sed -e "s;{{SA_NAME}};$(SA_NAME);g" | sed -e "s;{{TS_DEST_IP}};$(TS_DEST_IP);g" | kubectl create -f- + sed -e "s;{{TS_KUBE_SECRET}};$TS_KUBE_SECRET;g" proxy.yaml | sed -e "s;{{SA_NAME}};$SA_NAME;g" | sed -e "s;{{TS_DEST_IP}};$TS_DEST_IP;g" | kubectl create -f- subnet-router: @kubectl delete -f subnet.yaml --ignore-not-found --grace-period=0 - @sed -e "s;{{TS_KUBE_SECRET}};$(TS_KUBE_SECRET);g" subnet.yaml | sed -e "s;{{SA_NAME}};$(SA_NAME);g" | sed -e "s;{{TS_ROUTES}};$(TS_ROUTES);g" | kubectl create -f- + @sed -e "s;{{TS_KUBE_SECRET}};$TS_KUBE_SECRET;g" subnet.yaml | sed -e "s;{{SA_NAME}};$SA_NAME;g" | sed -e "s;{{TS_ROUTES}};$TS_ROUTES;g" | kubectl create -f- From 84ad03a0d0acf6faafcfa6bddab133239ca3d244 Mon Sep 17 00:00:00 2001 From: Mitchell Macpherson Date: Sat, 10 Dec 2022 08:10:47 +1100 Subject: [PATCH 2/2] Use curly braces for more accurate string expansion Signed-off-by: Mitchell Macpherson --- docs/k8s/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/k8s/Makefile b/docs/k8s/Makefile index e47548276..1b9414c3e 100644 --- a/docs/k8s/Makefile +++ b/docs/k8s/Makefile @@ -7,22 +7,22 @@ SA_NAME ?= tailscale TS_KUBE_SECRET ?= tailscale rbac: - @sed -e "s;{{TS_KUBE_SECRET}};$TS_KUBE_SECRET;g" role.yaml | kubectl apply -f - - @sed -e "s;{{SA_NAME}};$SA_NAME;g" rolebinding.yaml | kubectl apply -f - - @sed -e "s;{{SA_NAME}};$SA_NAME;g" sa.yaml | kubectl apply -f - + @sed -e "s;{{TS_KUBE_SECRET}};${TS_KUBE_SECRET};g" role.yaml | kubectl apply -f - + @sed -e "s;{{SA_NAME}};${SA_NAME};g" rolebinding.yaml | kubectl apply -f - + @sed -e "s;{{SA_NAME}};${SA_NAME};g" sa.yaml | kubectl apply -f - sidecar: @kubectl delete -f sidecar.yaml --ignore-not-found --grace-period=0 - @sed -e "s;{{TS_KUBE_SECRET}};$TS_KUBE_SECRET;g" sidecar.yaml | sed -e "s;{{SA_NAME}};$SA_NAME;g" | kubectl create -f- + @sed -e "s;{{TS_KUBE_SECRET}};${TS_KUBE_SECRET};g" sidecar.yaml | sed -e "s;{{SA_NAME}};${SA_NAME};g" | kubectl create -f- userspace-sidecar: @kubectl delete -f userspace-sidecar.yaml --ignore-not-found --grace-period=0 - @sed -e "s;{{TS_KUBE_SECRET}};$TS_KUBE_SECRET;g" userspace-sidecar.yaml | sed -e "s;{{SA_NAME}};$SA_NAME;g" | kubectl create -f- + @sed -e "s;{{TS_KUBE_SECRET}};${TS_KUBE_SECRET};g" userspace-sidecar.yaml | sed -e "s;{{SA_NAME}};${SA_NAME};g" | kubectl create -f- proxy: kubectl delete -f proxy.yaml --ignore-not-found --grace-period=0 - sed -e "s;{{TS_KUBE_SECRET}};$TS_KUBE_SECRET;g" proxy.yaml | sed -e "s;{{SA_NAME}};$SA_NAME;g" | sed -e "s;{{TS_DEST_IP}};$TS_DEST_IP;g" | kubectl create -f- + sed -e "s;{{TS_KUBE_SECRET}};${TS_KUBE_SECRET};g" proxy.yaml | sed -e "s;{{SA_NAME}};${SA_NAME};g" | sed -e "s;{{TS_DEST_IP}};${TS_DEST_IP};g" | kubectl create -f- subnet-router: @kubectl delete -f subnet.yaml --ignore-not-found --grace-period=0 - @sed -e "s;{{TS_KUBE_SECRET}};$TS_KUBE_SECRET;g" subnet.yaml | sed -e "s;{{SA_NAME}};$SA_NAME;g" | sed -e "s;{{TS_ROUTES}};$TS_ROUTES;g" | kubectl create -f- + @sed -e "s;{{TS_KUBE_SECRET}};${TS_KUBE_SECRET};g" subnet.yaml | sed -e "s;{{SA_NAME}};${SA_NAME};g" | sed -e "s;{{TS_ROUTES}};${TS_ROUTES};g" | kubectl create -f-