Skip to content

Route backend jobs to use correct image #993

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

Merged
deer-wmde merged 4 commits into from
Nov 14, 2025
Merged

Route backend jobs to use correct image #993

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
488d041
Route backend jobs to use correct image
tarrow Nov 6, 2025
87937d4
parse out service name from backend host
tarrow Nov 12, 2025
35a638a
try getting service using field not label selector
tarrow Nov 12, 2025
2c197da
fix pint
tarrow Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions app/Jobs/ProcessMediaWikiJobsJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Jobs;

use App\Services\MediaWikiHostResolver;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeUnique;
use Illuminate\Contracts\Queue\ShouldQueue;
Expand All @@ -27,14 +28,28 @@ public function uniqueId(): string {
return $this->wikiDomain;
}

public function handle(Client $kubernetesClient): void {
public function handle(Client $kubernetesClient, MediaWikiHostResolver $resolver): void {
$domain = $resolver->getBackendHostForDomain($this->wikiDomain);
Copy link
Copy Markdown
Contributor

@deer-wmde deer-wmde Nov 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

while reading I confused this $domain var with a wiki domain, I'd suggest $mwBackendHost or something

Copy link
Copy Markdown
Contributor Author

@tarrow tarrow Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea; I picked a different name. I can see why you were confused for sure. I wanted to make it clear that this isn't a host like an ip but actually a domain for a service. Hopefully this makes sense now.

$serviceName = $domain;
$kubernetesClient->setNamespace('default');
$backendService = $kubernetesClient->services()->setLabelSelector([
'name' => $serviceName,
Copy link
Copy Markdown
Contributor

@deer-wmde deer-wmde Nov 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if it will work like this, as the name of the service seems more like mediawiki-143-app-backend than mediawiki-143-app-backend.default.svc.cluster.local ?

see kubectl get service mediawiki-143-app-backend -o yaml

Copy link
Copy Markdown
Contributor Author

@tarrow tarrow Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, you're totally right. I just took the first bit. Apparently also the LabelSelector was wrong and I should have used the field one with metadata.name. I basically only determined this my trial and error though.

])->first();

if ($backendService === null) {
$this->fail(
new \RuntimeException(
'Unable to find a matching MediaWiki backend service in the cluster'
)
);

return;
}

$MWPodSelector = $backendService->toArray()['spec']['selector'];
$mediawikiPod = $kubernetesClient->pods()->setFieldSelector([
'status.phase' => 'Running',
])->setLabelSelector([
'app.kubernetes.io/name' => 'mediawiki',
'app.kubernetes.io/component' => 'app-backend',
])->first();
])->setLabelSelector($MWPodSelector)->first();

if ($mediawikiPod === null) {
$this->fail(
Expand Down
31 changes: 26 additions & 5 deletions tests/Jobs/ProcessMediaWikiJobsJobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Tests\Jobs;

use App\Jobs\ProcessMediaWikiJobsJob;
use App\Services\MediaWikiHostResolver;
use GuzzleHttp\Handler\MockHandler;
use GuzzleHttp\HandlerStack;
use GuzzleHttp\Psr7\Response;
Expand All @@ -16,6 +17,9 @@ class ProcessMediaWikiJobsJobTest extends TestCase {
use RefreshDatabase;

public function testJobFailOnNoMediaWikiPod() {

$mockResolver = $this->createMock(MediaWikiHostResolver::class);

$mockJob = $this->createMock(Job::class);
$mockJob->expects($this->once())->method('fail');

Expand All @@ -24,6 +28,7 @@ public function testJobFailOnNoMediaWikiPod() {

$mock = new MockHandler([
new Response(200, [], json_encode(['items' => []])),
new Response(200, [], json_encode(['items' => []])),
]);

$handlerStack = HandlerStack::create($mock);
Expand All @@ -35,17 +40,30 @@ public function testJobFailOnNoMediaWikiPod() {
$job->handle(new Client([
'master' => 'https://kubernetes.default.svc',
'token' => '/var/run/secrets/kubernetes.io/serviceaccount/token',
], null, $mockGuzzle));
], null, $mockGuzzle), $mockResolver);
}

public function testJobDoesNotFail() {
$mockResolver = $this->createMock(MediaWikiHostResolver::class);
$mockJob = $this->createMock(Job::class);
$mockJob->expects($this->never())->method('fail');

$job = new ProcessMediaWikiJobsJob('test.wikibase.cloud');
$job->setJob($mockJob);

$mock = new MockHandler([
new Response(200, [], json_encode(['items' => [
[
'kind' => 'Service',
'spec' => [
'selector' => [
'app.kubernetes.io/component' => 'app-backend',
'app.kubernetes.io/instance' => 'mediawiki-143',
'app.kubernetes.io/name' => 'mediawiki',
],
],
],
]])),
new Response(200, [], json_encode(['items' => [
[
'kind' => 'Pod',
Expand Down Expand Up @@ -75,9 +93,12 @@ public function testJobDoesNotFail() {
'verify' => '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt',
]);

$job->handle(new Client([
'master' => 'https://kubernetes.default.svc',
'token' => '/var/run/secrets/kubernetes.io/serviceaccount/token',
], null, $mockGuzzle));
$job->handle(
new Client([
'master' => 'https://kubernetes.default.svc',
'token' => '/var/run/secrets/kubernetes.io/serviceaccount/token',
], null, $mockGuzzle),
$mockResolver
);
}
}
Loading