From bbc76231a0f8383e238b8762f3cc46fff0061e8d Mon Sep 17 00:00:00 2001
From: Pierangelo Di Pilato <pierdipi@redhat.com>
Date: Mon, 14 Oct 2024 13:02:41 +0200
Subject: [PATCH] Per application RPA

the RPA has the filename that is not application name dependent, so
new applications will override the existing ones rather than creating
new ones, so that we can just take them as they are and commit to
"`releng`".

Remove `v` prefix from tags.

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
---
 .../{prod.yaml => serverless-operator-135-prod.yaml}          | 2 +-
 .../{stage.yaml => serverless-operator-135-stage.yaml}        | 2 +-
 pkg/konfluxgen/konfluxgen.go                                  | 4 ++--
 pkg/konfluxgen/releaseplanadmission.template.yaml             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename .konflux/releaseplanadmissions/{prod.yaml => serverless-operator-135-prod.yaml} (99%)
 rename .konflux/releaseplanadmissions/{stage.yaml => serverless-operator-135-stage.yaml} (99%)

diff --git a/.konflux/releaseplanadmissions/prod.yaml b/.konflux/releaseplanadmissions/serverless-operator-135-prod.yaml
similarity index 99%
rename from .konflux/releaseplanadmissions/prod.yaml
rename to .konflux/releaseplanadmissions/serverless-operator-135-prod.yaml
index 0d0853d4..15ff0da2 100755
--- a/.konflux/releaseplanadmissions/prod.yaml
+++ b/.konflux/releaseplanadmissions/serverless-operator-135-prod.yaml
@@ -128,4 +128,4 @@ spec:
       tags:
         - "{{ git_sha }}"
         - "{{ git_short_sha }}"
-        - "v1.35.0"
+        - "1.35.0"
diff --git a/.konflux/releaseplanadmissions/stage.yaml b/.konflux/releaseplanadmissions/serverless-operator-135-stage.yaml
similarity index 99%
rename from .konflux/releaseplanadmissions/stage.yaml
rename to .konflux/releaseplanadmissions/serverless-operator-135-stage.yaml
index a6c954a1..fb161f47 100755
--- a/.konflux/releaseplanadmissions/stage.yaml
+++ b/.konflux/releaseplanadmissions/serverless-operator-135-stage.yaml
@@ -128,4 +128,4 @@ spec:
       tags:
         - "{{ git_sha }}"
         - "{{ git_short_sha }}"
-        - "v1.35.0"
+        - "1.35.0"
diff --git a/pkg/konfluxgen/konfluxgen.go b/pkg/konfluxgen/konfluxgen.go
index 48ffaea0..32a284eb 100644
--- 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, "prod.yaml")
+	outputFilePath := filepath.Join(outputDir, fmt.Sprintf("%s-prod.yaml", Truncate(Sanitize(appName))))
 
 	components, err := getComponentImageRefs(csv)
 	if err != nil {
@@ -739,7 +739,7 @@ func GenerateReleasePlanAdmission(csvPath string, resourceOutputPath string, app
 		})
 	}
 
-	outputFilePath = filepath.Join(outputDir, "stage.yaml")
+	outputFilePath = filepath.Join(outputDir, fmt.Sprintf("%s-stage.yaml", Truncate(Sanitize(appName))))
 	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
index 96d35acb..530c1503 100644
--- a/pkg/konfluxgen/releaseplanadmission.template.yaml
+++ b/pkg/konfluxgen/releaseplanadmission.template.yaml
@@ -19,4 +19,4 @@ spec:
       tags:
         - "{{ git_sha }}"
         - "{{ git_short_sha }}"
-        - "v{{{ .Version }}}"
+        - "{{{ .Version }}}"