Add template range to output

main.go

@@ -425,12 +425,12 @@ func main() {
 					table.SetNoWhiteSpace(true)
 
 					for _, addon := range k8sAddons {
-						templateName, _, err := util.GetTemplate(data.K8sVersionedTemplates, addon, k8sVersion)
+						templateName, templateRange, _, err := util.GetTemplate(data.K8sVersionedTemplates, addon, k8sVersion)
 						if err != nil {
 							table.Append([]string{addon, fmt.Sprintf("%v", err)})
 							continue
 						}
-						table.Append([]string{addon, templateName})
+						table.Append([]string{addon, fmt.Sprintf("%s (%s)", templateName, templateRange)})
 					}
 
 					table.Render()
@@ -495,11 +495,11 @@ func main() {
 					k8sAddons := util.GetAddonNames(dataVersion1.K8sVersionedTemplates)
 
 					for _, addon := range k8sAddons {
-						templateName1, _, err := util.GetTemplate(dataVersion1.K8sVersionedTemplates, addon, k8sVersion1)
+						templateName1, _, _, err := util.GetTemplate(dataVersion1.K8sVersionedTemplates, addon, k8sVersion1)
 						if err != nil {
 							templateName1 = fmt.Sprintf("Error: %v", err)
 						}
-						templateName2, _, err := util.GetTemplate(dataVersion2.K8sVersionedTemplates, addon, k8sVersion2)
+						templateName2, _, _, err := util.GetTemplate(dataVersion2.K8sVersionedTemplates, addon, k8sVersion2)
 						if err != nil {
 							templateName2 = fmt.Sprintf("Error: %v", err)
 						}

util/util.go

@@ -295,22 +295,22 @@ func GetAddonNames(data map[string]map[string]string) []string {
 	return k8sAddons
 }
 
-func GetTemplate(data map[string]map[string]string, templateName, k8sVersion string) (string, string, error) {
+func GetTemplate(data map[string]map[string]string, templateName, k8sVersion string) (string, string, string, error) {
 	versionData := data[templateName]
 	toMatch, err := semver.Make(k8sVersion[1:])
 	if err != nil {
-		return "", "", fmt.Errorf("k8sVersion not sem-ver %s %v", k8sVersion, err)
+		return "", "", "", fmt.Errorf("k8sVersion not sem-ver %s %v", k8sVersion, err)
 	}
 	for k := range versionData {
 		testRange, err := semver.ParseRange(k)
 		if err != nil {
-			return "", "", fmt.Errorf("range for %s not sem-ver %v %v", templateName, testRange, err)
+			return "", "", "", fmt.Errorf("range for %s not sem-ver %v %v", templateName, testRange, err)
 		}
 		if testRange(toMatch) {
-			return versionData[k], data[kdm.TemplateKeys][versionData[k]], nil
+			return versionData[k], k, data[kdm.TemplateKeys][versionData[k]], nil
 		}
 	}
-	return "", "", fmt.Errorf("no %s template found for k8sVersion %s", templateName, k8sVersion)
+	return "", "", "", fmt.Errorf("no %s template found for k8sVersion %s", templateName, k8sVersion)
 }
 
 func FileExists(path string) (bool, error) {