Align label generation and apply on container-source as well

Signed-off-by: Matthias Wessendorf <[email protected]>
knative · Nov 28, 2024 · 553a735 · 553a735
1 parent 545c14c
commit 553a735
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 36 deletions.
diff --git a/pkg/reconciler/integration/helper.go b/pkg/reconciler/integration/helper.go
@@ -124,3 +124,9 @@ func MakeSSLEnvVar() []corev1.EnvVar {
 		},
 	}
 }
+
+func Labels(name string) map[string]string {
+	return map[string]string{
+		"app.kubernetes.io/name": name,
+	}
+}
diff --git a/pkg/reconciler/integration/sink/integrationsink_test.go b/pkg/reconciler/integration/sink/integrationsink_test.go
@@ -18,6 +18,7 @@ package sink
 
 import (
 	"fmt"
+	"knative.dev/eventing/pkg/reconciler/integration"
 
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/ptr"
@@ -33,7 +34,6 @@ import (
 	sinksv1alpha1 "knative.dev/eventing/pkg/apis/sinks/v1alpha1"
 	fakeeventingclient "knative.dev/eventing/pkg/client/injection/client/fake"
 	"knative.dev/eventing/pkg/client/injection/reconciler/sinks/v1alpha1/integrationsink"
-	"knative.dev/eventing/pkg/reconciler/integration/sink/resources"
 	fakekubeclient "knative.dev/pkg/client/injection/kube/client/fake"
 	"knative.dev/pkg/kmeta"
 	"knative.dev/pkg/logging"
@@ -187,16 +187,16 @@ func makeDeployment(sink *sinksv1alpha1.IntegrationSink, ready *corev1.Condition
 			OwnerReferences: []metav1.OwnerReference{
 				*kmeta.NewControllerRef(sink),
 			},
-			Labels: resources.Labels(sink.Name),
+			Labels: integration.Labels(sink.Name),
 		},
 		Status: status,
 		Spec: appsv1.DeploymentSpec{
 			Selector: &metav1.LabelSelector{
-				MatchLabels: resources.Labels(sink.Name),
+				MatchLabels: integration.Labels(sink.Name),
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: resources.Labels(sink.Name),
+					Labels: integration.Labels(sink.Name),
 				},
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
@@ -274,7 +274,7 @@ func makeService(name, namespace string) *corev1.Service {
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
 			Namespace: namespace,
-			Labels:    resources.Labels(sinkName),
+			Labels:    integration.Labels(sinkName),
 			OwnerReferences: []metav1.OwnerReference{
 				{
 					APIVersion:         "sinks.knative.dev/v1alpha1",
@@ -295,7 +295,7 @@ func makeService(name, namespace string) *corev1.Service {
 					TargetPort: intstr.IntOrString{IntVal: 8080},
 				},
 			},
-			Selector: resources.Labels(sinkName),
+			Selector: integration.Labels(sinkName),
 		},
 	}
 }

diff --git a/pkg/reconciler/integration/sink/resources/container_image.go b/pkg/reconciler/integration/sink/resources/container_image.go
@@ -40,15 +40,15 @@ func MakeDeploymentSpec(sink *v1alpha1.IntegrationSink) *appsv1.Deployment {
 			OwnerReferences: []metav1.OwnerReference{
 				*kmeta.NewControllerRef(sink),
 			},
-			Labels: Labels(sink.Name),
+			Labels: integration.Labels(sink.Name),
 		},
 		Spec: appsv1.DeploymentSpec{
 			Selector: &metav1.LabelSelector{
-				MatchLabels: Labels(sink.Name),
+				MatchLabels: integration.Labels(sink.Name),
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: Labels(sink.Name),
+					Labels: integration.Labels(sink.Name),
 				},
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
@@ -84,10 +84,10 @@ func MakeService(sink *v1alpha1.IntegrationSink) *corev1.Service {
 			OwnerReferences: []metav1.OwnerReference{
 				*kmeta.NewControllerRef(sink),
 			},
-			Labels: Labels(sink.Name),
+			Labels: integration.Labels(sink.Name),
 		},
 		Spec: corev1.ServiceSpec{
-			Selector: Labels(sink.Name),
+			Selector: integration.Labels(sink.Name),
 			Ports: []corev1.ServicePort{
 				{
 					Name:       "http",

diff --git a/pkg/reconciler/integration/sink/resources/labels.go b/pkg/reconciler/integration/sink/resources/labels.go
diff --git a/pkg/reconciler/integration/source/integrationsource_test.go b/pkg/reconciler/integration/source/integrationsource_test.go
@@ -18,6 +18,7 @@ package source
 
 import (
 	"fmt"
+	"knative.dev/eventing/pkg/reconciler/integration"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -188,9 +189,13 @@ func makeContainerSource(source *sourcesv1alpha1.IntegrationSource, ready *corev
 			},
 			Name:      containerSourceName,
 			Namespace: source.Namespace,
+			Labels:    integration.Labels(source.Name),
 		},
 		Spec: sourcesv1.ContainerSourceSpec{
 			Template: corev1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: integration.Labels(source.Name),
+				},
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
 						{

diff --git a/pkg/reconciler/integration/source/resources/containersource.go b/pkg/reconciler/integration/source/resources/containersource.go
@@ -34,10 +34,13 @@ func NewContainerSource(source *v1alpha1.IntegrationSource) *sourcesv1.Container
 			},
 			Name:      ContainerSourceName(source),
 			Namespace: source.Namespace,
+			Labels:    integration.Labels(source.Name),
 		},
 		Spec: sourcesv1.ContainerSourceSpec{
-
 			Template: corev1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: integration.Labels(source.Name),
+				},
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
 						{

diff --git a/pkg/reconciler/integration/source/resources/containersource_test.go b/pkg/reconciler/integration/source/resources/containersource_test.go
@@ -18,6 +18,7 @@ package resources
 
 import (
 	"fmt"
+	"knative.dev/eventing/pkg/reconciler/integration"
 	"testing"
 
 	sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1"
@@ -67,9 +68,13 @@ func TestNewContainerSource(t *testing.T) {
 			OwnerReferences: []metav1.OwnerReference{
 				*kmeta.NewControllerRef(source),
 			},
+			Labels: integration.Labels(source.Name),
 		},
 		Spec: sourcesv1.ContainerSourceSpec{
 			Template: corev1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: integration.Labels(source.Name),
+				},
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
 						{