Merge pull request #285 from leanix/bugfix/missing-namespace-cronjob

Add namespacename to cronjob
leanix · Jun 9, 2023 · f0d9cbb · f0d9cbb
2 parents 6c84e7a + 2747121
commit f0d9cbb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/pkg/iris/workloads/services/mapper/cronjob.go b/pkg/iris/workloads/services/mapper/cronjob.go
@@ -50,8 +50,9 @@ func (m *workloadMapper) CreateCronjobEcst(cluster models.Cluster, cronJob batch
 			NoOfNodes:  cluster.NoOfNodes,
 			K8sVersion: cluster.K8sVersion,
 		},
-		ServiceName: service,
-		Timestamp:   cronJob.CreationTimestamp.UTC().Format(time.RFC3339),
+		NamespaceName: cronJob.Namespace,
+		ServiceName:   service,
+		Timestamp:     cronJob.CreationTimestamp.UTC().Format(time.RFC3339),
 	}
 	return mappedDeployment
 }

diff --git a/pkg/iris/workloads/services/mapper/mapping_test.go b/pkg/iris/workloads/services/mapper/mapping_test.go
@@ -1,8 +1,12 @@
 package mapper
 
 import (
+	"testing"
+	"time"
+
 	"github.com/leanix/leanix-k8s-connector/pkg/iris/workloads/models"
 	"github.com/leanix/leanix-k8s-connector/pkg/kubernetes"
+	"github.com/leanix/leanix-k8s-connector/pkg/logger"
 	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
 	batchv1 "k8s.io/api/batch/v1"
@@ -12,11 +16,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/utils/pointer"
-	"testing"
-	"time"
 )
 
 func Test_MapWorkloads_success(t *testing.T) {
+	logger.Init()
 	dummyServices := []runtime.Object{
 		&corev1.Service{
 			Spec: corev1.ServiceSpec{

diff --git a/pkg/kubernetes/deployments.go b/pkg/kubernetes/deployments.go
@@ -3,13 +3,15 @@ package kubernetes
 import (
 	"context"
 
+	"github.com/leanix/leanix-k8s-connector/pkg/logger"
 	v1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // Deployments gets the list of deployments in a namespace
 func (k *API) Deployments(namespace string) (*v1.DeploymentList, error) {
 	deployments, err := k.Client.AppsV1().Deployments(namespace).List(context.Background(), metav1.ListOptions{})
+	logger.Infof("list of workload deployments: %v", deployments)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/kubernetes/deployments_test.go b/pkg/kubernetes/deployments_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/leanix/leanix-k8s-connector/pkg/logger"
 	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -12,6 +13,7 @@ import (
 )
 
 func TestDeployments(t *testing.T) {
+	logger.Init()
 	// create a dummy nodes
 	dummyDeployments := []runtime.Object{
 		&appsv1.Deployment{