Tag images with 'latest' tag (#226)

Signed-off-by: Pierangelo Di Pilato <[email protected]>
openshift-knative · Sep 3, 2024 · e9f6e14 · e9f6e14
1 parent 3cba828
commit e9f6e14
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/pkg/konfluxgen/docker-build.yaml b/pkg/konfluxgen/docker-build.yaml
@@ -108,6 +108,10 @@ spec:
     description: Path to a file with build arguments for buildah, see https://www.mankier.com/1/buildah-build#--build-arg-file
     name: build-args-file
     type: string
+  - default: []
+    description: Additional image tags
+    name: additional-tags
+    type: array
   results:
   - description: ""
     name: IMAGE_URL
@@ -400,6 +404,8 @@ spec:
     params:
     - name: IMAGE
       value: $(tasks.build-container.results.IMAGE_URL)
+    - name: ADDITIONAL_TAGS
+      value: $(params.additional-tags)
     runAfter:
     - build-container
     taskRef:

diff --git a/pkg/konfluxgen/fbc-builder.yaml b/pkg/konfluxgen/fbc-builder.yaml
@@ -93,6 +93,10 @@ spec:
     description: Build a source image.
     name: build-source-image
     type: string
+  - default: []
+    description: Additional image tags
+    name: additional-tags
+    type: array
   results:
   - description: ""
     name: IMAGE_URL
@@ -232,6 +236,8 @@ spec:
     params:
     - name: IMAGE
       value: $(tasks.build-container.results.IMAGE_URL)
+    - name: ADDITIONAL_TAGS
+      value: $(params.additional-tags)
     runAfter:
     - build-container
     taskRef:

diff --git a/pkg/konfluxgen/konfluxgen.go b/pkg/konfluxgen/konfluxgen.go
@@ -173,7 +173,7 @@ func Generate(cfg Config) error {
 				}
 			}
 
-			applications[appKey][dockerfileComponentKey(cfg.ComponentNameFunc, c.ReleaseBuildConfiguration, ib)] = DockerfileApplicationConfig{
+			r := DockerfileApplicationConfig{
 				ApplicationName:           cfg.ApplicationName,
 				ComponentName:             Truncate(Sanitize(cfg.ComponentNameFunc(c.ReleaseBuildConfiguration, ib))),
 				ReleaseBuildConfiguration: c.ReleaseBuildConfiguration,
@@ -182,7 +182,9 @@ func Generate(cfg Config) error {
 				Nudges:                        append(cfg.Nudges, cfg.NudgesFunc(c.ReleaseBuildConfiguration, ib)...),
 				Pipeline:                      pipeline,
 				AdditionalTektonCELExpression: cfg.AdditionalTektonCELExpressionFunc(c.ReleaseBuildConfiguration, ib),
+				Tags:                          []string{"latest"},
 			}
+			applications[appKey][dockerfileComponentKey(cfg.ComponentNameFunc, c.ReleaseBuildConfiguration, ib)] = r
 		}
 	}
 
@@ -349,6 +351,8 @@ type DockerfileApplicationConfig struct {
 	AdditionalTektonCELExpression string
 	Event                         PipelineEvent
 	Pipeline                      Pipeline
+
+	Tags []string
 }
 
 type PipelineEvent string

diff --git a/pkg/konfluxgen/pipeline-run.template.yaml b/pkg/konfluxgen/pipeline-run.template.yaml
@@ -35,6 +35,10 @@ spec:
     {{{- end }}}
     - name: revision
       value: '{{revision}}'
+    {{{- if eq .Event "push" }}}
+    - name: additional-tags
+      value: [{{{ range $tag := .Tags }}} {{{ $tag }}}, {{{ end }}}]
+    {{{- end }}}
   pipelineRef:
     name: {{{ .Pipeline }}}
   taskRunTemplate: {}