fix: using labels instead of annotations for finding project namespace

open-component-model · Oct 26, 2023 · 8f2ba0f · 8f2ba0f
1 parent b04fdbe
commit 8f2ba0f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/controllers/get_project_in_namespace.go b/controllers/get_project_in_namespace.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/open-component-model/mpas-project-controller/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/open-component-model/mpas-project-controller/api/v1alpha1"
 )
 
 // GetProjectFromObjectNamespace returns the Project from the annotation of the current namespace that an object
@@ -19,7 +20,7 @@ func GetProjectFromObjectNamespace(ctx context.Context, c client.Client, obj cli
 		return nil, fmt.Errorf("failed to retrieve namespace for object: %w", err)
 	}
 
-	v, ok := ns.Annotations[v1alpha1.ProjectKey]
+	v, ok := ns.Labels[v1alpha1.ProjectKey]
 	if !ok {
 		return nil, fmt.Errorf("project key %s not found on namespace", v1alpha1.ProjectKey)
 	}

diff --git a/controllers/productdeploymentgenerator_controller_test.go b/controllers/productdeploymentgenerator_controller_test.go
@@ -52,7 +52,7 @@ func TestProductDeploymentGeneratorReconciler(t *testing.T) {
 	testNamespace := &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "test-namespace",
-			Annotations: map[string]string{
+			Labels: map[string]string{
 				projectv1.ProjectKey: "project",
 			},
 		},
@@ -266,7 +266,7 @@ func TestProductDeploymentGeneratorReconcilerWithValueFile(t *testing.T) {
 	testNamespace := &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "test-namespace",
-			Annotations: map[string]string{
+			Labels: map[string]string{
 				projectv1.ProjectKey: "project",
 			},
 		},

diff --git a/controllers/productdeploymentpipeline_controller_test.go b/controllers/productdeploymentpipeline_controller_test.go
@@ -35,7 +35,7 @@ func TestProductDeploymentPipelineReconciler(t *testing.T) {
 	testNamespace := &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "test-namespace",
-			Annotations: map[string]string{
+			Labels: map[string]string{
 				projectv1.ProjectKey: "project",
 			},
 		},

diff --git a/controllers/validation_controller_test.go b/controllers/validation_controller_test.go
@@ -35,7 +35,7 @@ func TestBasicReconcile(t *testing.T) {
 	testNamespace := &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "test-namespace",
-			Annotations: map[string]string{
+			Labels: map[string]string{
 				projectv1.ProjectKey: "project",
 			},
 		},
@@ -194,7 +194,7 @@ func TestRemovingGitRepositoryWhenPullRequestIsMerged(t *testing.T) {
 	testNamespace := &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "test-namespace",
-			Annotations: map[string]string{
+			Labels: map[string]string{
 				projectv1.ProjectKey: "project",
 			},
 		},