Do not update repo bases if GitSSHSecretRef is not set

utilitywarehouse · Mar 22, 2024 · d675ecb · d675ecb
1 parent 7e51a11
commit d675ecb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine AS build
+FROM golang:1.22-alpine AS build
 
 WORKDIR /src
 

diff --git a/go.mod b/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

diff --git a/run/runner.go b/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
 }

diff --git a/testdata/manifests/app-d-kustomize/kustomization.yaml b/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