Skip to content

Commit 5dd246f

Browse files
committed
Route backend jobs to use correct image
Bug: T408624
1 parent 216b16d commit 5dd246f

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

app/Jobs/ProcessMediaWikiJobsJob.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Jobs;
44

5+
use App\Services\MediaWikiHostResolver;
56
use Illuminate\Bus\Queueable;
67
use Illuminate\Contracts\Queue\ShouldBeUnique;
78
use Illuminate\Contracts\Queue\ShouldQueue;
@@ -27,14 +28,17 @@ public function uniqueId(): string {
2728
return $this->wikiDomain;
2829
}
2930

30-
public function handle(Client $kubernetesClient): void {
31+
public function handle(Client $kubernetesClient, MediaWikiHostResolver $resolver): void {
32+
$domain = $resolver->getBackendHostForDomain($this->wikiDomain);
33+
$serviceName = $domain;
3134
$kubernetesClient->setNamespace('default');
35+
$backendService = $kubernetesClient->services()->setLabelSelector([
36+
'name' => $serviceName,
37+
])->first();
38+
$MWPodSelector = $backendService->toArray()['spect']['selector'];
3239
$mediawikiPod = $kubernetesClient->pods()->setFieldSelector([
3340
'status.phase' => 'Running',
34-
])->setLabelSelector([
35-
'app.kubernetes.io/name' => 'mediawiki',
36-
'app.kubernetes.io/component' => 'app-backend',
37-
])->first();
41+
])->setLabelSelector($MWPodSelector)->first();
3842

3943
if ($mediawikiPod === null) {
4044
$this->fail(

0 commit comments

Comments
 (0)