Merge pull request #292 from utilitywarehouse/fix-upd-repo-bases

Do not update repo bases if GitSSHSecretRef is not set

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine AS build
+FROM golang:1.22-alpine AS build
 
 WORKDIR /src
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/utilitywarehouse/kube-applier
 
-go 1.20
+go 1.22
 
 require (
 	github.com/go-test/deep v1.0.5

run/runner.go

@@ -345,8 +345,10 @@ func (r *Runner) setupRepositoryClone(ctx context.Context, waybill *kubeapplierv
 		return "", "", err
 	}
 	// Rewrite repo addresses for those that want to use SSH keys to clone
-	if err := r.updateRepoBaseAddresses(tmpRepoDir); err != nil {
-		return "", "", err
+	if waybill.Spec.GitSSHSecretRef != nil {
+		if err := r.updateRepoBaseAddresses(tmpRepoDir); err != nil {
+			return "", "", err
+		}
 	}
 	return filepath.Join(tmpRepoDir, r.RepoPath), hash, nil
 }

run/runner_test.go

@@ -501,7 +501,7 @@ Some error output has been omitted because it may contain sensitive data
 					Commit:       bHeadCommitHash,
 					ErrorMessage: "exit status 1",
 					Finished:     metav1.Time{},
-					Output:       `(?s)Error: accumulating resources:.*'ssh:\/\/deploy_github_com\/utilitywarehouse\/kube-applier\/\/testdata\/bases\/simple-deployment\?ref=master'.*exit status 128`,
+					Output:       `(?s).*Please make sure you have the correct access rights.*exit status 128`,
 					Started:      metav1.Time{},
 					Success:      false,
 					Type:         PollingRun.String(),

testdata/manifests/app-d-kustomize/kustomization.yaml

@@ -1,4 +1,5 @@
 bases:
+  # kube-applier: key_should_be_ignored
   - ssh://github.com/utilitywarehouse/kube-applier//testdata/bases/simple-deployment?ref=master
 resources:
   - 00-namespace.yaml