Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from Dec 15, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69e4cec
Set ingress labels so it can be found again.
laurentluce Dec 15, 2023
0b8f32f
Use user service type for ingresses.
laurentluce Dec 15, 2023
e6ec421
Linting.
laurentluce Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...pls/kubernetes/kubernetes_kurtosis_backend/user_services_functions/start_user_services.go
View file
Open in desktop
Expand Up @@ -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)
Expand All @@ -452,6 +453,7 @@ func createStartServiceOperation(
ctx,
namespaceName,
ingressName,
ingressLabelsStrs,
ingressAnnotationsStrs,
ingressRules,
)
Expand Down
4 changes: 2 additions & 2 deletions container-engine-lib/lib/backend_impls/kubernetes/kubernetes_manager/kubernetes_manager.go
View file
Open in desktop
Expand Up @@ -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{
Expand All @@ -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,
Expand Down
9 changes: 3 additions & 6 deletions ...kend_impls/kubernetes/object_attributes_provider/label_value_consts/label_value_consts.go
View file
Open in desktop
Expand Up @@ -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"
laurentluce marked this conversation as resolved.
Show resolved Hide resolved
enclaveKurtosisResourceTypeLabelValueStr = "enclave"
apiContainerKurtosisResourceTypeLabelValueStr = "api-container"
userServiceKurtosisResourceTypeLabelValueStr = "user-service"

enclaveDataVolumeTypeLabelValueStr = "enclave-data"
filesArtifactsExpansionVolumeTypeLabelValueStr = "files-artifacts-expansion"
Expand All @@ -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)