Merge pull request #388 from chmouel/issue-381-add-release-version-label-to-resources-in-release-file

Author: chmouel

.github/pull_request_template.md

@@ -13,5 +13,4 @@ your descriptive commit message(s)! -->
 - [ ] 🎁 If that's something that is possible to do please make sure to check if we can add a e2e test.
 - [ ] 🔎 If there is a flakyness in the CI tests then make sure to get the flakyness fixed before merging or if that's not possible there is a good reason to bypass it.
 
-_See [the contribution guide](https://github.com/tektoncd/catalog/blob/master/CONTRIBUTING.md)
-for more details._
+_See [the developer guide](https://github.com/openshift-pipelines/pipelines-as-code/blob/main/docs/development.md) for a bit more details._

.tekton/release-pipeline.yaml

@@ -66,6 +66,7 @@ spec:
                 msg="Release version ${version}"
                 echo ${msg}
                 export TARGET_BRANCH=${version}
+                export PAC_VERSION=${version}
                 hack/upload-file-to-github.py \
                     --message "Release yaml generated for Release ${TARGET_BRANCH}" \
                     --owner-repository openshift-pipelines/pipelines-as-code \

Makefile

@@ -9,10 +9,10 @@ OUTPUT_DIR=bin
 
 YAML_FILES := $(shell find . -type f -regex ".*y[a]ml" -print)
 
-ifeq ($(TKN_PAC_VERSION),)
-	TKN_PAC_VERSION="$(shell git describe --tags --exact-match 2>/dev/null || echo nightly-`date +'%Y%m%d'`-`git rev-parse --short HEAD`)"
+ifeq ($(PAC_VERSION),)
+	PAC_VERSION="$(shell git describe --tags --exact-match 2>/dev/null || echo nightly-`date +'%Y%m%d'`-`git rev-parse --short HEAD`)"
 endif
-FLAGS += -ldflags "-X github.com/openshift-pipelines/pipelines-as-code/pkg/params/version.Version=$(TKN_PAC_VERSION) $(LDFLAGS)"
+FLAGS += -ldflags "-X github.com/openshift-pipelines/pipelines-as-code/pkg/params/version.Version=$(PAC_VERSION) $(LDFLAGS)"
 
 all: $(OUTPUT_DIR)/pipelines-as-code $(OUTPUT_DIR)/tkn-pac test
 
@@ -28,11 +28,13 @@ $(OUTPUT_DIR)/%: cmd/% FORCE
 .PHONY: releaseyaml
 releaseyaml: ## Generate release.yaml, use it like this `make releaseyaml|kubectl apply -f-`
 	@env TARGET_REPO=$(QUAY_REPOSITORY) TARGET_BRANCH=$(QUAY_REPOSITORY_BRANCH) TARGET_NAMESPACE=$(TARGET_NAMESPACE) \
+		PAC_VERSION=$(PAC_VERSION) \
 		./hack/generate-releaseyaml.sh
 
 .PHONY: releaseko
 releaseko: ## Generate release.yaml with ko but changing the target_namespace and branch if needed
 	@env TARGET_BRANCH=$(QUAY_REPOSITORY_BRANCH) TARGET_NAMESPACE=$(TARGET_NAMESPACE) \
+		PAC_VERSION=$(PAC_VERSION) \
 		./hack/generate-releaseyaml.sh ko
 
 check: lint test

config/100-namespace.yaml

@@ -16,5 +16,6 @@ kind: Namespace
 metadata:
   name: pipelines-as-code
   labels:
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: pipelines-as-code

config/200-role.yaml

@@ -21,6 +21,7 @@ metadata:
   name: pipelines-as-code-sa-el
   namespace: pipelines-as-code
   labels:
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: pipelines-as-code
 ---
@@ -30,6 +31,7 @@ metadata:
   name: pipelines-as-code-role-el
   namespace: pipelines-as-code
   labels:
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: pipelines-as-code
 rules:
@@ -58,6 +60,7 @@ metadata:
   name: pipelines-as-code-binding
   namespace: pipelines-as-code
   labels:
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: pipelines-as-code
 subjects:
@@ -75,6 +78,7 @@ metadata:
   name: openshift-pipeline-as-code-clusterrole
   namespace: pipelines-as-code
   labels:
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: pipelines-as-code
 rules:
@@ -110,6 +114,7 @@ metadata:
   name: pipelines-as-code-clusterbinding
   namespace: pipelines-as-code
   labels:
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: pipelines-as-code
 subjects:

config/300-repositories.yaml

@@ -17,6 +17,7 @@ kind: CustomResourceDefinition
 metadata:
   name: repositories.pipelinesascode.tekton.dev
   labels:
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: pipelines-as-code
 spec:

config/302-pac-configmap.yaml

@@ -47,4 +47,5 @@ metadata:
   name: pipelines-as-code
   namespace: pipelines-as-code
   labels:
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/part-of: pipelines-as-code

config/305-cleanup-cron.yaml

@@ -18,6 +18,7 @@ metadata:
   name: pipelines-as-code-pr-cleanup
   namespace: pipelines-as-code
   labels:
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/part-of: pipelines-as-code
 spec:
   concurrencyPolicy: Replace

config/400-trigger-eventlistenner.yaml

@@ -19,6 +19,7 @@ metadata:
   namespace: pipelines-as-code
   labels:
     app.kubernetes.io/instance: default
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/part-of: pipelines-as-code
 spec:
   serviceAccountName: pipelines-as-code-sa-el

config/401-github-issue-recheck.yaml

@@ -18,6 +18,7 @@ metadata:
   name: pipelines-as-code-github-recheck
   namespace: pipelines-as-code
   labels:
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: pipelines-as-code
 spec:
@@ -56,6 +57,7 @@ metadata:
   name: pipelines-as-code-github-recheck
   namespace: pipelines-as-code
   labels:
+    app.kubernetes.io/version: "devel"
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: pipelines-as-code
 spec:
@@ -81,6 +83,7 @@ spec:
       metadata:
         generateName: pipelines-as-code-run-
         labels:
+          app.kubernetes.io/version: "devel"
           app.kubernetes.io/managed-by: pipelines-as-code
           pipelinesascode.tekton.dev/event: $(tt.params.event_type)
       spec: