Fixed dependencies, changed shell caller

Makefile

@@ -18,12 +18,12 @@ dependencies:
 	go mod tidy
 #	go mod vendor
 
-bin/buildversion.exe: cmd/buildversion.go
+bin/buildversion.exe: cmd/buildversion.go 
 	set TMP="C:\Temp\gotemp"
 	go build -o bin/buildversion.exe cmd/buildversion.go
 	set TMP="C:\Users\Chris\AppData\Local\Temp"
 
-version.txt: bin/buildversion.exe
+version.txt: bin/buildversion.exe dependencies
 	bin/buildversion.exe  
 
 test: _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl

deploy/sthome-webhook/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.0.3-alpha.2.39
+appVersion: v0.0.3-alpha.2.41
 description: Cert-Manager webhook for sthome
 name: sthome-webhook
-version: 0.0.3-alpha.2.39
+version: 0.0.3-alpha.2.41

deploy/sthome-webhook/values.yaml

@@ -31,7 +31,7 @@ clusterIssuer:
 image:
   repository: stuurmcp/cert-manager-webhook-sthome
   #repository: wstat.sthome.net:5000/cert-manager-webhook-sthome
-  tag: 0.0.3-alpha.2.39
+  tag: 0.0.3-alpha.2.41
   #pullPolicy should be IfNotPresent. Set to Always for testing purposes
   pullPolicy: IfNotPresent
 

sthome/shell.go

@@ -9,30 +9,31 @@ import (
 	"k8s.io/klog/v2"
 )
 
-func Execute(script string, command []string) (bool, error) {
+func Execute(dir string, script string, command []string) (bool, error) {
 	currentUser, err := user.Current()
 	if err != nil {
 		log.Fatalf("CZ: Unable to get current user: %s", err)
 	}
 	klog.InfoS("CZ: Executing ", "user", currentUser.Name, "script", command)
 	cmd := &exec.Cmd{
+		Dir:    dir,
 		Path:   script,
 		Args:   command,
 		Stdout: os.Stdout,
 		Stderr: os.Stderr,
 	}
 
-	err = cmd.Start()
+	err = cmd.Run()
 	if err != nil {
-		klog.Errorf("CZ: Script Start return error: %s\n", err)
+		klog.Errorf("CZ: Script run return error: %s\n", err)
 		return false, err
 	}
-
+	/*
-	err = cmd.Wait()
+		err = cmd.Wait()
-	if err != nil {
+		if err != nil {
-		klog.Errorf("CZ: Script Wait return error: %s\n", err)
+			klog.Errorf("CZ: Script Wait return error: %s\n", err)
-		return false, err
+			return false, err
-	}
+		}
-
+	*/
 	return true, nil
 }

sthome/solver_local.go

@@ -12,8 +12,9 @@ import (
 )
 
 const (
-	providerName     = "sthome"
+	providerName        = "sthome"
-	dnsUpdaterScript = "/mnt/stpool1/scripts/acme/updatedns.sh"
+	dnsUpdaterScriptDir = "/mnt/stpool1/scripts/acme/"
+	dnsUpdaterScriptCmd = "updatedns.sh"
 )
 
 // LocalDNSProviderSolver implements the provider-specific logic needed to
@@ -78,14 +79,14 @@ func (loc *LocalDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) error
 
 	// shell command
 	command := []string{
-		dnsUpdaterScript,
+		dnsUpdaterScriptCmd,
 		"arg1=-set",
 		"arg2=.net",
 		fmt.Sprintf("arg3=%s", ch.DNSName),
 		"arg4=TXT",
 		fmt.Sprintf("arg5=%s", ch.Key),
 	}
-	success, _ := Execute(dnsUpdaterScript, command)
+	success, _ := Execute(dnsUpdaterScriptDir, dnsUpdaterScriptCmd, command)
 	klog.InfoS("CZ: Execute set returned", "success", success)
 	return nil
 }
@@ -101,14 +102,14 @@ func (loc *LocalDNSProviderSolver) CleanUp(ch *v1alpha1.ChallengeRequest) error
 
 	// shell command
 	command := []string{
-		dnsUpdaterScript,
+		dnsUpdaterScriptCmd,
 		"arg1=-unset",
 		"arg2=.net",
 		fmt.Sprintf("arg3=%s", ch.DNSName),
 		"arg4=TXT",
 		fmt.Sprintf("arg5=%s", ch.Key),
 	}
-	success, _ := Execute(dnsUpdaterScript, command)
+	success, _ := Execute(dnsUpdaterScriptDir, dnsUpdaterScriptCmd, command)
 	klog.InfoS("CZ: Execute unset returned", "success", success)
 	return nil
 }

version.txt

@@ -1,3 +1,3 @@
-0.0.3-alpha.2.39
+0.0.3-alpha.2.41
-20240330-0131
+20240330-0159
-39
+41