From fd8ea603f1c5bf64b94868f46302e22537087927 Mon Sep 17 00:00:00 2001 From: Kartik Mathur Date: Tue, 18 May 2021 15:07:20 -0700 Subject: [PATCH 1/4] change command --- pkg/controller/kubedirectorcluster/types.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/controller/kubedirectorcluster/types.go b/pkg/controller/kubedirectorcluster/types.go index 1d90e6c3..35bae15d 100644 --- a/pkg/controller/kubedirectorcluster/types.go +++ b/pkg/controller/kubedirectorcluster/types.go @@ -89,10 +89,7 @@ const ( rm -rf /opt/guestconfig/appconfig.tgz` appPrepConfigStatus = "/opt/guestconfig/configure.status" appPrepConfigRunCmd = `rm -f /opt/guestconfig/configure.* && - echo -n %s= > ` + appPrepConfigStatus + ` && - nohup sh -c "` + appPrepStartscript + ` --configure; - echo -n $? >> ` + appPrepConfigStatus + `" > /opt/guestconfig/configure.stdout - 2> /opt/guestconfig/configure.stderr &` + echo -n %s= > ` + appPrepConfigStatus + ` && nohup sh -c "` + appPrepStartscript + ` --configure 2>/opt/guestconfig/configure.stderr 1>/opt/guestconfig/configure.stdout;echo $? >> ` + appPrepConfigStatus + `" &` fileInjectionCommand = `mkdir -p %s && cd %s && curl -L %s -o %s` appPrepConfigReconnectCmd = `echo -n %s= > ` + appPrepConfigStatus + ` && From 53f8fcf3cc0be705e57a127c712f0ecd9baa615d Mon Sep 17 00:00:00 2001 From: Kartik Mathur Date: Tue, 18 May 2021 19:55:52 -0700 Subject: [PATCH 2/4] fix command newline --- pkg/controller/kubedirectorcluster/types.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/controller/kubedirectorcluster/types.go b/pkg/controller/kubedirectorcluster/types.go index 35bae15d..430c42bf 100644 --- a/pkg/controller/kubedirectorcluster/types.go +++ b/pkg/controller/kubedirectorcluster/types.go @@ -89,7 +89,9 @@ const ( rm -rf /opt/guestconfig/appconfig.tgz` appPrepConfigStatus = "/opt/guestconfig/configure.status" appPrepConfigRunCmd = `rm -f /opt/guestconfig/configure.* && - echo -n %s= > ` + appPrepConfigStatus + ` && nohup sh -c "` + appPrepStartscript + ` --configure 2>/opt/guestconfig/configure.stderr 1>/opt/guestconfig/configure.stdout;echo $? >> ` + appPrepConfigStatus + `" &` + echo -n %s= > ` + appPrepConfigStatus + ` && + nohup sh -c "` + appPrepStartscript + ` --configure 2>/opt/guestconfig/configure.stderr 1>/opt/guestconfig/configure.stdout; + echo $? >> ` + appPrepConfigStatus + `" &` fileInjectionCommand = `mkdir -p %s && cd %s && curl -L %s -o %s` appPrepConfigReconnectCmd = `echo -n %s= > ` + appPrepConfigStatus + ` && From 5300567f15e79ee259ae837f4dc79be3afdbf35d Mon Sep 17 00:00:00 2001 From: Kartik Mathur Date: Thu, 20 May 2021 14:14:19 -0700 Subject: [PATCH 3/4] fix exit status using single quote --- pkg/controller/kubedirectorcluster/types.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/kubedirectorcluster/types.go b/pkg/controller/kubedirectorcluster/types.go index 430c42bf..52751151 100644 --- a/pkg/controller/kubedirectorcluster/types.go +++ b/pkg/controller/kubedirectorcluster/types.go @@ -90,8 +90,8 @@ const ( appPrepConfigStatus = "/opt/guestconfig/configure.status" appPrepConfigRunCmd = `rm -f /opt/guestconfig/configure.* && echo -n %s= > ` + appPrepConfigStatus + ` && - nohup sh -c "` + appPrepStartscript + ` --configure 2>/opt/guestconfig/configure.stderr 1>/opt/guestconfig/configure.stdout; - echo $? >> ` + appPrepConfigStatus + `" &` + nohup sh -c '` + appPrepStartscript + ` --configure 2>/opt/guestconfig/configure.stderr 1>/opt/guestconfig/configure.stdout; + echo -n $? >> ` + appPrepConfigStatus + `' &` fileInjectionCommand = `mkdir -p %s && cd %s && curl -L %s -o %s` appPrepConfigReconnectCmd = `echo -n %s= > ` + appPrepConfigStatus + ` && From 4c860a6c491e437aef5c8823e0580d492c9beba4 Mon Sep 17 00:00:00 2001 From: Kartik Mathur Date: Thu, 20 May 2021 16:01:10 -0700 Subject: [PATCH 4/4] same fix for reconnect --- pkg/controller/kubedirectorcluster/types.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/controller/kubedirectorcluster/types.go b/pkg/controller/kubedirectorcluster/types.go index 52751151..10314258 100644 --- a/pkg/controller/kubedirectorcluster/types.go +++ b/pkg/controller/kubedirectorcluster/types.go @@ -95,9 +95,8 @@ const ( fileInjectionCommand = `mkdir -p %s && cd %s && curl -L %s -o %s` appPrepConfigReconnectCmd = `echo -n %s= > ` + appPrepConfigStatus + ` && - nohup sh -c "` + appPrepStartscript + ` --reconnect; - echo -n $? >> ` + appPrepConfigStatus + `" >> /opt/guestconfig/configure.stdout - 2>> /opt/guestconfig/configure.stderr &` + nohup sh -c '` + appPrepStartscript + ` --reconnect 2>/opt/guestconfig/configure.stderr 1>/opt/guestconfig/configure.stdout; + echo -n $? >> ` + appPrepConfigStatus + `' &` ) const (