Fix bug and pick up subversion from package values or flag

Signed-off-by: F. Gold <fgold@vmware.com>

hack/packages/package-tools/cmd/package-bundle-generate.go

@@ -246,6 +246,7 @@ func generatePackageBundles(projectRootDir, toolsBinDir string) error {
 			bundleLock.Bundle.Image,
 			constants.LocalRegistryURL+"/"+repository.Packages[i].Name+"@sha256:",
 		)
+		packageValues.Repositories[packageRepository].Packages[i].PackageSubVersion = subVersion
 		yamlData, err := yaml.Marshal(&packageValues)
 		if err != nil {
 			return fmt.Errorf("error while marshaling: %w", err)

hack/packages/package-tools/cmd/repo-bundle-generate.go

@@ -130,6 +130,7 @@ func generatePackageBundlesSha256(projectRootDir, localRegistry string) error {
 
 		packageValues.Repositories[packageRepository].Packages[i].Version = getPackageVersion(version)
 		packageValues.Repositories[packageRepository].Packages[i].Sha256 = utils.AfterString(bundleLock.Bundle.Image, localRegistry+"/"+pkg.Name+"@sha256:")
+		packageValues.Repositories[packageRepository].Packages[i].PackageSubVersion = subVersion
 		yamlData, err := yaml.Marshal(&packageValues)
 		if err != nil {
 			return fmt.Errorf("error while marshaling: %w", err)
@@ -229,10 +230,17 @@ func generatePackageCR(projectRootDir, toolsBinDir, registry, packageArtifactDir
 	if err := utils.CreateDir(filepath.Join(packageArtifactDirectory, pkg.Name+"."+pkg.Domain)); err != nil {
 		return err
 	}
+
 	pkgVersion := getPackageVersion(version)
+	packageSubVersion := pkg.PackageSubVersion
+	if subVersion != "" {
+		// subVersion flag overrides package values subversion.
+		packageSubVersion = subVersion
+	}
+
 	packageFileName := pkgVersion + ".yml"
-	if pkg.PackageSubVersion != "" {
-		packageFileName = pkgVersion + pkg.PackageSubVersion + ".yml"
+	if packageSubVersion != "" {
+		packageFileName = pkgVersion + "+" + packageSubVersion + ".yml"
 	}
 
 	// generate Package CR and write it to a file
@@ -245,6 +253,7 @@ func generatePackageCR(projectRootDir, toolsBinDir, registry, packageArtifactDir
 		"-v", "registry="+registry,
 		"-v", "timestamp="+utils.GetFormattedCurrentTime(),
 		"-v", "version="+pkgVersion,
+		"-v", "subVersion="+packageSubVersion,
 	) // #nosec G204
 
 	packageFilePath := filepath.Join(packageArtifactDirectory, pkg.Name+"."+pkg.Domain, packageFileName)

hack/packages/templates/repo-utils/package-cr-overlay.yaml

@@ -6,31 +6,39 @@
 #@ package = get_package(package_repository, data.values.packageName)
 #@ packageSpec = get_package_spec(package_repository, package)
 
-#@ if not hasattr(package, "packageSubVersion") or package.packageSubVersion == "":
+#@ if not hasattr(package, "packageSubVersion") and data.values.subVersion == "":
 #@  if package.version == "latest":
 #@    packageVersion = data.values.version
 #@  else:
 #@    packageVersion = package.version
 #@  end
 #@ else:
+#@  subVersion = data.values.subVersion
+#@  if subVersion == "":
+#@    subVersion = package.packageSubVersion
+#@  end
 #@  if package.version == "latest":
-#@    packageVersion = data.values.version + "+" + package.packageSubVersion
+#@    packageVersion = data.values.version + "+" + subVersion
 #@  else:
-#@    packageVersion = package.version + "+" + package.packageSubVersion
+#@    packageVersion = package.version + "+" + subVersion
 #@  end
 #@ end
 
-#@ if not hasattr(package, "packageSubVersion") or package.packageSubVersion == "":
+#@ if not hasattr(package, "packageSubVersion") and data.values.subVersion == "":
 #@  if package.version == "latest":
 #@    imagePackageVersion = "v" + data.values.version
 #@  else:
 #@    imagePackageVersion = "v" + package.version
 #@  end
 #@ else:
+#@  subVersion = data.values.subVersion
+#@  if subVersion == "":
+#@    subVersion = package.packageSubVersion
+#@  end
 #@  if package.version == "latest":
-#@    imagePackageVersion = "v" + data.values.version + "_" + package.packageSubVersion
+#@    imagePackageVersion = "v" + data.values.version + "_" + subVersion
 #@  else:
-#@    imagePackageVersion = "v" + package.version + "_" + package.packageSubVersion
+#@    imagePackageVersion = "v" + package.version + "_" + subVersion
 #@  end
 #@ end
 
@@ -51,7 +59,7 @@ spec:
   #@overlay/match missing_ok=True
   #@overlay/replace
   licenses:
-  - #@ packageLicense
+    -  #@ packageLicense
   template:
     spec:
       #@ if/end packageSpec:
@@ -74,11 +82,11 @@ spec:
             #@overlay/match missing_ok=True
             rawOptions:
               #@overlay/match by=lambda indexOrKey, left, right: "wait-timeout" in left, missing_ok=True
-              - #@ "--wait-timeout={}".format(packageSpec.deploy.kappWaitTimeout)
+              -  #@ "--wait-timeout={}".format(packageSpec.deploy.kappWaitTimeout)
               #@overlay/match by=lambda indexOrKey, left, right: "kube-api-qps" in left, missing_ok=True
-              - #@ "--kube-api-qps={}".format(packageSpec.deploy.kubeAPIQPS)
+              -  #@ "--kube-api-qps={}".format(packageSpec.deploy.kubeAPIQPS)
               #@overlay/match by=lambda indexOrKey, left, right: "kube-api-burst" in left, missing_ok=True
-              - #@ "--kube-api-burst={}".format(packageSpec.deploy.kubeAPIBurst)
+              -  #@ "--kube-api-burst={}".format(packageSpec.deploy.kubeAPIBurst)
             #@ end
   #@overlay/match missing_ok=True
   valuesSchema: