fix: check service account token first

uselagoon · Oct 3, 2023 · 03057e2 · 03057e2
1 parent 781e2e3
commit 03057e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/cmd/tasks_run.go b/cmd/tasks_run.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 
@@ -169,7 +168,7 @@ func iterateTaskGenerator(allowDeployMissingErrors bool, taskRunner runTaskInEnv
 		if _, err := os.Stat(filename); errors.Is(err, os.ErrNotExist) {
 			retErr = fmt.Errorf("A target namespace is required to run pre/post-rollout tasks")
 		}
-		nsb, err := ioutil.ReadFile(filename)
+		nsb, err := os.ReadFile(filename)
 		if err != nil {
 			retErr = err
 		}

diff --git a/internal/lagoon/tasks.go b/internal/lagoon/tasks.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"time"
@@ -85,9 +84,9 @@ func getConfig() (*rest.Config, error) {
 	if *kubeconfig == "" {
 		//Fall back on out of cluster
 		// read the deployer token.
-		token, err := ioutil.ReadFile("/var/run/secrets/lagoon/deployer/token")
+		token, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/token")
 		if err != nil {
-			token, err = ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/token")
+			token, err = os.ReadFile("/var/run/secrets/lagoon/deployer/token")
 			if err != nil {
 				return nil, err
 			}