From 2a9255d97e197f71488b4cb6bbca2f1fa67266d7 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <dmvolod@gmail.com>
Date: Mon, 29 Jul 2019 17:59:53 +0300
Subject: [PATCH] BuildConfig's, ImageStream's and Pod's not labeled with
 camel-k and can't delete with -l 'app=camel-k' Fixes #840

---
 deploy/operator-deployment.yaml | 1 +
 deploy/resources.go             | 1 +
 pkg/builder/kaniko/publisher.go | 3 +++
 pkg/builder/s2i/publisher.go    | 6 ++++++
 4 files changed, 11 insertions(+)

diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml
index 904e69c4ec..01c593cb3f 100644
--- a/deploy/operator-deployment.yaml
+++ b/deploy/operator-deployment.yaml
@@ -34,6 +34,7 @@ spec:
       labels:
         name: camel-k-operator
         camel.apache.org/component: operator
+        app: "camel-k"
     spec:
       serviceAccountName: camel-k-operator
       containers:
diff --git a/deploy/resources.go b/deploy/resources.go
index 8552575cfe..2999aceb12 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -2757,6 +2757,7 @@ spec:
       labels:
         name: camel-k-operator
         camel.apache.org/component: operator
+        app: "camel-k"
     spec:
       serviceAccountName: camel-k-operator
       containers:
diff --git a/pkg/builder/kaniko/publisher.go b/pkg/builder/kaniko/publisher.go
index 4e798ead02..c17dc94827 100644
--- a/pkg/builder/kaniko/publisher.go
+++ b/pkg/builder/kaniko/publisher.go
@@ -119,6 +119,9 @@ func publisher(ctx *builder.Context) error {
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: ctx.Namespace,
 			Name:      "camel-k-" + ctx.Build.Meta.Name,
+			Labels: map[string]string{
+				"app": "camel-k",
+			},
 		},
 		Spec: corev1.PodSpec{
 			Containers: []corev1.Container{
diff --git a/pkg/builder/s2i/publisher.go b/pkg/builder/s2i/publisher.go
index 61c9dd9511..3c70f146a2 100644
--- a/pkg/builder/s2i/publisher.go
+++ b/pkg/builder/s2i/publisher.go
@@ -51,6 +51,9 @@ func publisher(ctx *builder.Context) error {
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "camel-k-" + ctx.Build.Meta.Name,
 			Namespace: ctx.Namespace,
+			Labels: map[string]string{
+				"app": "camel-k",
+			},
 		},
 		Spec: buildv1.BuildConfigSpec{
 			CommonSpec: buildv1.CommonSpec{
@@ -93,6 +96,9 @@ func publisher(ctx *builder.Context) error {
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "camel-k-" + ctx.Build.Meta.Name,
 			Namespace: ctx.Namespace,
+			Labels: map[string]string{
+				"app": "camel-k",
+			},
 		},
 		Spec: imagev1.ImageStreamSpec{
 			LookupPolicy: imagev1.ImageLookupPolicy{