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 <[email protected]>
openshift-knative · Oct 14, 2024 · bbc7623 · bbc7623
1 parent a0e0ae6
commit bbc7623
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.konflux/releaseplanadmissions/prod.yaml → ...issions/serverless-operator-135-prod.yaml b/.konflux/releaseplanadmissions/prod.yaml → ...issions/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 → ...ssions/serverless-operator-135-stage.yaml b/.konflux/releaseplanadmissions/stage.yaml → ...ssions/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
@@ -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
@@ -19,4 +19,4 @@ spec:
       tags:
         - "{{ git_sha }}"
         - "{{ git_short_sha }}"
-        - "v{{{ .Version }}}"
+        - "{{{ .Version }}}"