cmd/konflux: track upstream for update-sources…

… instead of the same repository... Signed-off-by: Vincent Demeester <[email protected]>
openshift-pipelines · Sep 18, 2024 · 87c98a3 · 87c98a3
1 parent ac01d2e
commit 87c98a3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/cmd/konflux/main.go b/cmd/konflux/main.go
@@ -19,6 +19,7 @@ var templateFS embed.FS
 type Application struct {
 	Name       string
 	Repository string
+	Upstream   string
 	Branch     string
 	Components []string
 }
@@ -32,6 +33,7 @@ type Component struct {
 
 type Config struct {
 	Repository string
+	Upstream   string
 	Components []string
 }
 
@@ -52,6 +54,7 @@ func main() {
 	app := Application{
 		Name:       c.Repository,
 		Repository: path.Join("openshift-pipelines", c.Repository),
+		Upstream:   c.Upstream,
 		Components: c.Components,
 		Branch:     "main",
 	}

diff --git a/cmd/konflux/templates/github/workflows/update-sources-branches.yaml b/cmd/konflux/templates/github/workflows/update-sources-branches.yaml
@@ -36,7 +36,7 @@ jobs:
     - name: Clone {{.Repository}}
       uses: actions/checkout@v4
       with:
-        repository: {{.Repository}}
+        repository: {{.Upstream}}
         revision: {{"${{matrix.branch}}"}}
         path: upstream
 

diff --git a/cmd/konflux/templates/github/workflows/update-sources.yaml b/cmd/konflux/templates/github/workflows/update-sources.yaml
@@ -20,7 +20,7 @@ jobs:
     - name: Clone {{.Repository}}
       uses: actions/checkout@v4
       with:
-        repository: {{.Repository}}
+        repository: {{.Upstream}}
         path: upstream
 
     - name: Commit new changes

diff --git a/config/konflux/tektoncd-pipeline.yaml b/config/konflux/tektoncd-pipeline.yaml
@@ -1,4 +1,5 @@
 repository: tektoncd-pipeline
+upstream: tektoncd/pipeline
 components:
 - controller
 - entrypoint