Merge pull request #560 from opendevstack/fix/label-propagation

Do not add chart labels to tasks
opendevstack · Jun 10, 2022 · 154166d · 154166d
2 parents 166c2ef + 29f6f79
commit 154166d
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ listed in the changelog.
 
 ### Fixed
 - Pipeline runs are not pruned ([#557](https://github.com/opendevstack/ods-pipeline/issues/557))
+- Pipeline pods are listed under deployment pods ([#555](https://github.com/opendevstack/ods-pipeline/issues/555))
 
 ## [0.5.0] - 2022-06-09
 

diff --git a/deploy/ods-pipeline/charts/tasks/templates/task-ods-build-go.yaml b/deploy/ods-pipeline/charts/tasks/templates/task-ods-build-go.yaml
@@ -3,8 +3,6 @@ apiVersion: tekton.dev/v1beta1
 kind: '{{default "Task" .Values.global.taskKind}}'
 metadata:
   name: '{{default "ods" .Values.taskPrefix}}-build-go{{- include "taskSuffix" .}}'
-  labels:
-    {{- include "chart.labels" . | nindent 4}}
   annotations:
     "helm.sh/resource-policy": keep
 spec:

diff --git a/deploy/ods-pipeline/charts/tasks/templates/task-ods-build-gradle.yaml b/deploy/ods-pipeline/charts/tasks/templates/task-ods-build-gradle.yaml
@@ -3,8 +3,6 @@ apiVersion: tekton.dev/v1beta1
 kind: '{{default "Task" .Values.global.taskKind}}'
 metadata:
   name: '{{default "ods" .Values.taskPrefix}}-build-gradle{{- include "taskSuffix" .}}'
-  labels:
-    {{- include "chart.labels" . | nindent 4}}
   annotations:
     "helm.sh/resource-policy": keep
 spec:

diff --git a/deploy/ods-pipeline/charts/tasks/templates/task-ods-build-npm.yaml b/deploy/ods-pipeline/charts/tasks/templates/task-ods-build-npm.yaml
@@ -3,8 +3,6 @@ apiVersion: tekton.dev/v1beta1
 kind: '{{default "Task" .Values.global.taskKind}}'
 metadata:
   name: '{{default "ods" .Values.taskPrefix}}-build-npm{{- include "taskSuffix" .}}'
-  labels:
-    {{- include "chart.labels" . | nindent 4}}
   annotations:
     "helm.sh/resource-policy": keep
 spec:

diff --git a/deploy/ods-pipeline/charts/tasks/templates/task-ods-build-python.yaml b/deploy/ods-pipeline/charts/tasks/templates/task-ods-build-python.yaml
@@ -3,8 +3,6 @@ apiVersion: tekton.dev/v1beta1
 kind: '{{default "Task" .Values.global.taskKind}}'
 metadata:
   name: '{{default "ods" .Values.taskPrefix}}-build-python{{- include "taskSuffix" .}}'
-  labels:
-    {{- include "chart.labels" . | nindent 4}}
   annotations:
     "helm.sh/resource-policy": keep
 spec:

diff --git a/deploy/ods-pipeline/charts/tasks/templates/task-ods-deploy-helm.yaml b/deploy/ods-pipeline/charts/tasks/templates/task-ods-deploy-helm.yaml
@@ -3,8 +3,6 @@ apiVersion: tekton.dev/v1beta1
 kind: '{{default "Task" .Values.global.taskKind}}'
 metadata:
   name: '{{default "ods" .Values.taskPrefix}}-deploy-helm{{- include "taskSuffix" .}}'
-  labels:
-    {{- include "chart.labels" . | nindent 4}}
   annotations:
     "helm.sh/resource-policy": keep
 spec:

diff --git a/deploy/ods-pipeline/charts/tasks/templates/task-ods-finish.yaml b/deploy/ods-pipeline/charts/tasks/templates/task-ods-finish.yaml
@@ -2,8 +2,6 @@ apiVersion: tekton.dev/v1beta1
 kind: '{{default "Task" .Values.global.taskKind}}'
 metadata:
   name: '{{default "ods" .Values.taskPrefix}}-finish{{- include "taskSuffix" .}}'
-  labels:
-    {{- include "chart.labels" . | nindent 4}}
   annotations:
     "helm.sh/resource-policy": keep
 spec:

diff --git a/deploy/ods-pipeline/charts/tasks/templates/task-ods-package-image.yaml b/deploy/ods-pipeline/charts/tasks/templates/task-ods-package-image.yaml
@@ -3,8 +3,6 @@ apiVersion: tekton.dev/v1beta1
 kind: '{{default "Task" .Values.global.taskKind}}'
 metadata:
   name: '{{default "ods" .Values.taskPrefix}}-package-image{{- include "taskSuffix" .}}'
-  labels:
-    {{- include "chart.labels" . | nindent 4}}
   annotations:
     "helm.sh/resource-policy": keep
 spec:

diff --git a/deploy/ods-pipeline/charts/tasks/templates/task-ods-start.yaml b/deploy/ods-pipeline/charts/tasks/templates/task-ods-start.yaml
@@ -2,8 +2,6 @@ apiVersion: tekton.dev/v1beta1
 kind: '{{default "Task" .Values.global.taskKind}}'
 metadata:
   name: '{{default "ods" .Values.taskPrefix}}-start{{- include "taskSuffix" .}}'
-  labels:
-    {{- include "chart.labels" . | nindent 4}}
   annotations:
     "helm.sh/resource-policy": keep
 spec: