HEL-2715 Changed Selector nil pointer check

leanix · May 22, 2023 · 5aedc26 · 5aedc26
1 parent d12e5b9
commit 5aedc26
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pkg/iris/workloads/services/mapper/cronjob.go b/pkg/iris/workloads/services/mapper/cronjob.go
@@ -51,7 +51,7 @@ func (m *mapworkload) CreateCronjobEcst(clusterName string, cronJob batchv1.Cron
 
 func ResolveK8sServiceForK8sCronJob(services *v1.ServiceList, cronJob batchv1.CronJob) string {
 	cronJobService := ""
-	if cronJob.Spec.JobTemplate.Spec.Selector.MatchLabels != nil {
+	if cronJob.Spec.JobTemplate.Spec.Selector != nil {
 		for _, service := range services.Items {
 			sharedLabelsCronJob := map[string]string{}
 			sharedLabelsService := map[string]string{}

diff --git a/pkg/iris/workloads/services/mapper/daemonset.go b/pkg/iris/workloads/services/mapper/daemonset.go
@@ -49,7 +49,7 @@ func (m *mapworkload) CreateDaemonSetEcst(clusterName string, daemonSet appsv1.D
 
 func ResolveK8sServiceForK8sDaemonSet(services *v1.ServiceList, daemonSet appsv1.DaemonSet) string {
 	daemonSetService := ""
-	if daemonSet.Spec.Selector.MatchLabels != nil {
+	if daemonSet.Spec.Selector != nil {
 		for _, service := range services.Items {
 			sharedLabelsStatefulSet := map[string]string{}
 			sharedLabelsService := map[string]string{}

diff --git a/pkg/iris/workloads/services/mapper/deployment.go b/pkg/iris/workloads/services/mapper/deployment.go
@@ -72,7 +72,7 @@ func CreateK8sResources(resourceList v1.ResourceList) models.K8sResources {
 
 func ResolveK8sServiceForK8sDeployment(services *v1.ServiceList, deployment appsv1.Deployment) string {
 	deploymentService := ""
-	if deployment.Spec.Selector.MatchLabels != nil {
+	if deployment.Spec.Selector != nil {
 
 		for _, service := range services.Items {
 			sharedLabelsDeployment := map[string]string{}

diff --git a/pkg/iris/workloads/services/mapper/statefulset.go b/pkg/iris/workloads/services/mapper/statefulset.go
@@ -50,7 +50,7 @@ func (m *mapworkload) CreateStatefulSetEcst(clusterName string, statefulSet apps
 
 func ResolveK8sServiceForK8sStatefulSet(services *v1.ServiceList, statefulSet appsv1.StatefulSet) string {
 	statefulSetService := ""
-	if statefulSet.Spec.Selector.MatchLabels != nil {
+	if statefulSet.Spec.Selector != nil {
 
 		for _, service := range services.Items {
 			sharedLabelsStatefulSet := map[string]string{}