Merge pull request #430 from redhatrises/update_service

feat: update service asset to pass service name
CrowdStrike · Oct 6, 2023 · e68f259 · e68f259
2 parents b6b1dd0 + b6c05cc
commit e68f259
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 160 deletions.
diff --git a/controllers/falcon_container/ecr.go b/controllers/falcon_container/ecr.go
diff --git a/controllers/falcon_container/image_refresher.go b/controllers/falcon_container/image_refresher.go
diff --git a/controllers/falcon_container/service.go b/controllers/falcon_container/service.go
@@ -17,7 +17,7 @@ import (
 
 func (r *FalconContainerReconciler) reconcileService(ctx context.Context, log logr.Logger, falconContainer *falconv1alpha1.FalconContainer) (*corev1.Service, error) {
 	selector := map[string]string{common.FalconComponentKey: common.FalconSidecarSensor}
-	service := assets.Service(injectorName, r.Namespace(), common.FalconSidecarSensor, selector, *falconContainer.Spec.Injector.ListenPort)
+	service := assets.Service(injectorName, r.Namespace(), common.FalconSidecarSensor, selector, common.FalconServiceHTTPSName, *falconContainer.Spec.Injector.ListenPort)
 	updated := false
 	existingService := &corev1.Service{}
 

diff --git a/internal/controller/assets/service.go b/internal/controller/assets/service.go
@@ -8,7 +8,7 @@ import (
 )
 
 // Service returns a Kubernetes Service object
-func Service(name string, namespace string, component string, selector map[string]string, port int32) *corev1.Service {
+func Service(name string, namespace string, component string, selector map[string]string, portName string, port int32) *corev1.Service {
 	labels := common.CRLabels("service", name, component)
 	return &corev1.Service{
 		TypeMeta: metav1.TypeMeta{
@@ -24,7 +24,7 @@ func Service(name string, namespace string, component string, selector map[strin
 			Selector: selector,
 			Ports: []corev1.ServicePort{
 				{
-					Name:       common.FalconServiceHTTPSName,
+					Name:       portName,
 					Port:       port,
 					Protocol:   corev1.ProtocolTCP,
 					TargetPort: intstr.FromString(common.FalconServiceHTTPSName),

diff --git a/internal/controller/assets/service_test.go b/internal/controller/assets/service_test.go
@@ -27,7 +27,7 @@ func TestService(t *testing.T) {
 			Selector: selector,
 			Ports: []corev1.ServicePort{
 				{
-					Name:       common.FalconServiceHTTPSName,
+					Name:       "portName",
 					Port:       123,
 					Protocol:   corev1.ProtocolTCP,
 					TargetPort: intstr.FromString(common.FalconServiceHTTPSName),
@@ -36,7 +36,7 @@ func TestService(t *testing.T) {
 		},
 	}
 
-	got := Service("test", "test", "test", selector, 123)
+	got := Service("test", "test", "test", selector, "portName", 123)
 	if diff := cmp.Diff(want, got); diff != "" {
 		t.Errorf("Service() mismatch (-want +got): %s", diff)
 	}