Skip to content

Commit 4e91268

Browse files
authored
Merge pull request coollabsio#3707 from coollabsio/custom-traefik-middlewares
fix: parser, espacing container labels
2 parents 5fa6501 + ee7f820 commit 4e91268

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

bootstrap/helpers/shared.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3702,6 +3702,18 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
37023702
});
37033703
}
37043704
$serviceLabels = $labels->merge($defaultLabels);
3705+
if ($serviceLabels->count() > 0) {
3706+
if ($isApplication) {
3707+
$isContainerLabelEscapeEnabled = data_get($resource, 'settings.is_container_label_escape_enabled');
3708+
} else {
3709+
$isContainerLabelEscapeEnabled = data_get($resource, 'is_container_label_escape_enabled');
3710+
}
3711+
if ($isContainerLabelEscapeEnabled) {
3712+
$serviceLabels = $serviceLabels->map(function ($value, $key) {
3713+
return escapeDollarSign($value);
3714+
});
3715+
}
3716+
}
37053717
if (! $isDatabase && $fqdns instanceof Collection && $fqdns->count() > 0) {
37063718
if ($isApplication) {
37073719
$shouldGenerateLabelsExactly = $resource->destination->server->settings->generate_exact_labels;

0 commit comments

Comments
 (0)