Merge pull request #47 from fluxcd/revision-fix

stefanprodan · web-flow · commit 6ffb946c540e · 2020-04-28T20:41:10.000+03:00
git: fix revision for git tags
diff --git a/Dockerfile b/Dockerfile
@@ -20,7 +20,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o source-c
 
 FROM alpine:3.11
 
-RUN apk add --no-cache openssh-client ca-certificates tini 'git>=2.12.0' socat curl bash
+RUN apk add --no-cache openssh-client ca-certificates tar tini 'git>=2.12.0' socat curl bash
 
 COPY --from=builder /workspace/source-controller /usr/local/bin/
 
diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go
@@ -321,6 +321,9 @@ func (r *GitRepositoryReconciler) sync(ctx context.Context, repository sourcev1.
 
 	if revision == "" {
 		revision = fmt.Sprintf("%s/%s", branch, ref.Hash().String())
+		if repository.Spec.Reference.Tag != "" {
+			revision = fmt.Sprintf("%s/%s", repository.Spec.Reference.Tag, ref.Hash().String())
+		}
 	}
 
 	artifact := r.Storage.ArtifactFor(repository.Kind, repository.ObjectMeta.GetObjectMeta(),

Original file line number	Diff line number	Diff line change
`@@ -321,6 +321,9 @@ func (r *GitRepositoryReconciler) sync(ctx context.Context, repository sourcev1.`
`321`	`321`
`322`	`322`	`if revision == "" {`
`323`	`323`	`revision = fmt.Sprintf("%s/%s", branch, ref.Hash().String())`
	`324`	`+ if repository.Spec.Reference.Tag != "" {`
	`325`	`+ revision = fmt.Sprintf("%s/%s", repository.Spec.Reference.Tag, ref.Hash().String())`
	`326`	`+ }`
`324`	`327`	`}`
`325`	`328`
`326`	`329`	`artifact := r.Storage.ArtifactFor(repository.Kind, repository.ObjectMeta.GetObjectMeta(),`