Remove additional custom labels utility (#4184) (#4188)

(cherry picked from commit 865ebdb)
apache · Mar 30, 2023 · d99b906 · d99b906
1 parent 3db3310
commit d99b906
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 187 deletions.
diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go
@@ -33,7 +33,6 @@ import (
  "github.com/apache/camel-k/pkg/metadata"
  "github.com/apache/camel-k/pkg/util"
  "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/label"
  "github.com/apache/camel-k/pkg/util/uri"
 )
 
@@ -260,7 +259,9 @@ func (t *cronTrait) getCronJobFor(e *Environment) *batchv1.CronJob {
  BackoffLimit: &backoffLimit,
  Template: corev1.PodTemplateSpec{
  ObjectMeta: metav1.ObjectMeta{
- Labels: label.AddLabels(e.Integration.Name),
+ Labels: map[string]string{
+ v1.IntegrationLabel: e.Integration.Name,
+ },
  Annotations: annotations,
  },
  Spec: corev1.PodSpec{

diff --git a/pkg/trait/deployment.go b/pkg/trait/deployment.go
@@ -29,7 +29,6 @@ import (
 
  v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
  traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/label"
 )
 
 type deploymentTrait struct {
@@ -158,7 +157,9 @@ func (t *deploymentTrait) getDeploymentFor(e *Environment) *appsv1.Deployment {
  },
  Template: corev1.PodTemplateSpec{
  ObjectMeta: metav1.ObjectMeta{
- Labels: label.AddLabels(e.Integration.Name),
+ Labels: map[string]string{
+ v1.IntegrationLabel: e.Integration.Name,
+ },
  Annotations: annotations,
  },
  Spec: corev1.PodSpec{

diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go
@@ -31,7 +31,6 @@ import (
  traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
  "github.com/apache/camel-k/pkg/metadata"
  "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/label"
 )
 
 const (
@@ -262,7 +261,9 @@ func (t *knativeServiceTrait) getServiceFor(e *Environment) (*serving.Service, e
  ConfigurationSpec: serving.ConfigurationSpec{
  Template: serving.RevisionTemplateSpec{
  ObjectMeta: metav1.ObjectMeta{
- Labels: label.AddLabels(e.Integration.Name),
+ Labels: map[string]string{
+ v1.IntegrationLabel: e.Integration.Name,
+ },
  Annotations: revisionAnnotations,
  },
  Spec: serving.RevisionSpec{

diff --git a/pkg/util/label/label.go b/pkg/util/label/label.go
diff --git a/pkg/util/label/label_test.go b/pkg/util/label/label_test.go