From 91b37883621dc773eacdc12e91ce8e1ab46a3744 Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Fri, 16 Jul 2021 00:22:05 -0700 Subject: [PATCH] Fix trace for optional GitRepository.Spec.Reference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check for existence of GitRepository.Spec.Reference when displaying a trace to avoid error: ✗ template: tmpl:28:21: executing "tmpl" at <.GitRepository.Spec.Reference.Tag>: nil pointer evaluating *v1beta1.GitRepositoryRef.Tag Fixes issue #1621 Manually tested using the use cases highlighted in the issue. Signed-off-by: Allen Porter --- cmd/flux/trace.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/flux/trace.go b/cmd/flux/trace.go index 0c05ae28..22fa42a8 100644 --- a/cmd/flux/trace.go +++ b/cmd/flux/trace.go @@ -191,6 +191,7 @@ Status: Unknown GitRepository: {{.GitRepository.Name}} Namespace: {{.GitRepository.Namespace}} URL: {{.GitRepository.Spec.URL}} +{{- if .GitRepository.Spec.Reference }} {{- if .GitRepository.Spec.Reference.Tag }} Tag: {{.GitRepository.Spec.Reference.Tag}} {{- else if .GitRepository.Spec.Reference.SemVer }} @@ -198,6 +199,7 @@ Tag: {{.GitRepository.Spec.Reference.SemVer}} {{- else if .GitRepository.Spec.Reference.Branch }} Branch: {{.GitRepository.Spec.Reference.Branch}} {{- end }} +{{- end }} {{- if .GitRepository.Status.Artifact }} Revision: {{.GitRepository.Status.Artifact.Revision}} {{- end }}