fix: Set the user service K8S ingress labels so it can be found (#1962)

## Description: The user service K8S ingress labels need to be set properly so the ingress can be found during retrieval and deletion operations. ## Is this change user facing? NO ## References (if applicable): #1941
kurtosis-tech · Dec 15, 2023 · 9cc5f77 · 9cc5f77
1 parent c37dd7f
commit 9cc5f77
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/...pls/kubernetes/kubernetes_kurtosis_backend/user_services_functions/start_user_services.go b/...pls/kubernetes/kubernetes_kurtosis_backend/user_services_functions/start_user_services.go
@@ -438,6 +438,7 @@ func createStartServiceOperation(
 		if err != nil {
 			return nil, stacktrace.Propagate(err, "An error occurred getting attributes for new ingress for service with UUID '%v'", serviceUuid)
 		}
+		ingressLabelsStrs := shared_helpers.GetStringMapFromLabelMap(ingressAttributes.GetLabels())
 		ingressAnnotationsStrs := shared_helpers.GetStringMapFromAnnotationMap(ingressAttributes.GetAnnotations())
 
 		ingressRules, err := getUserServiceIngressRules(serviceRegistrationObj, privatePorts)
@@ -452,6 +453,7 @@ func createStartServiceOperation(
 				ctx,
 				namespaceName,
 				ingressName,
+				ingressLabelsStrs,
 				ingressAnnotationsStrs,
 				ingressRules,
 			)

diff --git a/container-engine-lib/lib/backend_impls/kubernetes/kubernetes_manager/kubernetes_manager.go b/container-engine-lib/lib/backend_impls/kubernetes/kubernetes_manager/kubernetes_manager.go
@@ -1792,7 +1792,7 @@ func (manager *KubernetesManager) HasComputeNodes(ctx context.Context) (bool, er
 
 // ---------------------------Ingresses------------------------------------------------------------------------------
 
-func (manager *KubernetesManager) CreateIngress(ctx context.Context, namespace string, name string, annotations map[string]string, rules []netv1.IngressRule) (*netv1.Ingress, error) {
+func (manager *KubernetesManager) CreateIngress(ctx context.Context, namespace string, name string, labels map[string]string, annotations map[string]string, rules []netv1.IngressRule) (*netv1.Ingress, error) {
 	client := manager.kubernetesClientSet.NetworkingV1().Ingresses(namespace)
 
 	ingress := &netv1.Ingress{
@@ -1813,7 +1813,7 @@ func (manager *KubernetesManager) CreateIngress(ctx context.Context, namespace s
 			},
 			DeletionTimestamp:          nil,
 			DeletionGracePeriodSeconds: nil,
-			Labels:                     nil,
+			Labels:                     labels,
 			Annotations:                annotations,
 			OwnerReferences:            nil,
 			Finalizers:                 nil,

diff --git a/...kend_impls/kubernetes/object_attributes_provider/label_value_consts/label_value_consts.go b/...kend_impls/kubernetes/object_attributes_provider/label_value_consts/label_value_consts.go
@@ -15,10 +15,9 @@ const (
 	engineKurtosisResourceTypeLabelValueStr = "kurtosis-engine"
 	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! DO NOT CHANGE THESE VALUES !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-	enclaveKurtosisResourceTypeLabelValueStr            = "enclave"
-	apiContainerKurtosisResourceTypeLabelValueStr       = "api-container"
-	userServiceKurtosisResourceTypeLabelValueStr        = "user-service"
-	userServiceIngressKurtosisResourceTypeLabelValueStr = "user-service-ingress"
+	enclaveKurtosisResourceTypeLabelValueStr      = "enclave"
+	apiContainerKurtosisResourceTypeLabelValueStr = "api-container"
+	userServiceKurtosisResourceTypeLabelValueStr  = "user-service"
 
 	enclaveDataVolumeTypeLabelValueStr             = "enclave-data"
 	filesArtifactsExpansionVolumeTypeLabelValueStr = "files-artifacts-expansion"
@@ -37,7 +36,5 @@ var EngineKurtosisResourceTypeKubernetesLabelValue = kubernetes_label_value.Must
 var EnclaveKurtosisResourceTypeKubernetesLabelValue = kubernetes_label_value.MustCreateNewKubernetesLabelValue(enclaveKurtosisResourceTypeLabelValueStr)
 var APIContainerKurtosisResourceTypeKubernetesLabelValue = kubernetes_label_value.MustCreateNewKubernetesLabelValue(apiContainerKurtosisResourceTypeLabelValueStr)
 var UserServiceKurtosisResourceTypeKubernetesLabelValue = kubernetes_label_value.MustCreateNewKubernetesLabelValue(userServiceKurtosisResourceTypeLabelValueStr)
-var UserServiceIngressKurtosisResourceTypeKubernetesLabelValue = kubernetes_label_value.MustCreateNewKubernetesLabelValue(userServiceIngressKurtosisResourceTypeLabelValueStr)
-
 var EnclaveDataVolumeTypeKubernetesLabelValue = kubernetes_label_value.MustCreateNewKubernetesLabelValue(enclaveDataVolumeTypeLabelValueStr)
 var FilesArtifactsExpansionVolumeTypeKubernetesLabelValue = kubernetes_label_value.MustCreateNewKubernetesLabelValue(filesArtifactsExpansionVolumeTypeLabelValueStr)