diff --git a/container-engine-lib/lib/backend_impls/kubernetes/kubernetes_kurtosis_backend/user_services_functions/start_user_services.go b/container-engine-lib/lib/backend_impls/kubernetes/kubernetes_kurtosis_backend/user_services_functions/start_user_services.go index 7f6c896284..aae79f02c3 100644 --- a/container-engine-lib/lib/backend_impls/kubernetes/kubernetes_kurtosis_backend/user_services_functions/start_user_services.go +++ b/container-engine-lib/lib/backend_impls/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 index 83ee109452..d8fbd883c6 100644 --- 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/container-engine-lib/lib/backend_impls/kubernetes/object_attributes_provider/label_value_consts/label_value_consts.go b/container-engine-lib/lib/backend_impls/kubernetes/object_attributes_provider/label_value_consts/label_value_consts.go index b474d981aa..90a95f1552 100644 --- a/container-engine-lib/lib/backend_impls/kubernetes/object_attributes_provider/label_value_consts/label_value_consts.go +++ b/container-engine-lib/lib/backend_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)