Add patch-level version

Signed-off-by: Pierangelo Di Pilato <[email protected]>
openshift-knative · Oct 14, 2024 · fc80c19 · fc80c19
1 parent bbc7623
commit fc80c19
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...issions/serverless-operator-135-prod.yaml → ...ns/serverless-operator-135-1350-prod.yaml b/...issions/serverless-operator-135-prod.yaml → ...ns/serverless-operator-135-1350-prod.yaml
@@ -1,7 +1,7 @@
 apiVersion: appstudio.redhat.com/v1alpha1
 kind: ReleasePlanAdmission
 metadata:
-  name: serverless-operator-135
+  name: serverless-operator-135-1350
   namespace: rhtap-releng-tenant
 spec:
   applications: [serverless-operator-135]

diff --git a/...ssions/serverless-operator-135-stage.yaml → ...s/serverless-operator-135-1350-stage.yaml b/...ssions/serverless-operator-135-stage.yaml → ...s/serverless-operator-135-1350-stage.yaml
@@ -1,7 +1,7 @@
 apiVersion: appstudio.redhat.com/v1alpha1
 kind: ReleasePlanAdmission
 metadata:
-  name: serverless-operator-135
+  name: serverless-operator-135-1350
   namespace: rhtap-releng-tenant
 spec:
   applications: [serverless-operator-135]

diff --git a/pkg/konfluxgen/konfluxgen.go b/pkg/konfluxgen/konfluxgen.go
@@ -718,7 +718,7 @@ func GenerateReleasePlanAdmission(csvPath string, resourceOutputPath string, app
 	if err := os.MkdirAll(outputDir, 0777); err != nil {
 		return fmt.Errorf("failed to create release plan admissions directory: %w", err)
 	}
-	outputFilePath := filepath.Join(outputDir, fmt.Sprintf("%s-prod.yaml", Truncate(Sanitize(appName))))
+	outputFilePath := filepath.Join(outputDir, fmt.Sprintf("%s-%s-prod.yaml", Truncate(Sanitize(appName)), Truncate(Sanitize(csv.Spec.Version.String()))))
 
 	components, err := getComponentImageRefs(csv)
 	if err != nil {
@@ -739,7 +739,7 @@ func GenerateReleasePlanAdmission(csvPath string, resourceOutputPath string, app
 		})
 	}
 
-	outputFilePath = filepath.Join(outputDir, fmt.Sprintf("%s-stage.yaml", Truncate(Sanitize(appName))))
+	outputFilePath = filepath.Join(outputDir, fmt.Sprintf("%s-%s-stage.yaml", Truncate(Sanitize(appName)), Truncate(Sanitize(csv.Spec.Version.String()))))
 	if err := executeReleasePlanAdmissionTemplate(componentWithStageRepoRef, outputFilePath, appName, soVersion); err != nil {
 		return fmt.Errorf("failed to execute release plan admission template: %w", err)
 	}

diff --git a/pkg/konfluxgen/releaseplanadmission.template.yaml b/pkg/konfluxgen/releaseplanadmission.template.yaml
@@ -1,7 +1,7 @@
 apiVersion: appstudio.redhat.com/v1alpha1
 kind: ReleasePlanAdmission
 metadata:
-  name: {{{ truncate ( sanitize .ApplicationName ) }}}
+  name: {{{ truncate ( sanitize .ApplicationName ) }}}-{{{ truncate ( sanitize .Version ) }}}
   namespace: rhtap-releng-tenant
 spec:
   applications: [{{{ truncate ( sanitize .ApplicationName ) }}}]