Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
1 change: 1 addition & 0 deletions cluster/pulumi/common/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export * from './dockerConfig';
export * from './serviceAccount';
export * from './participantKms';
export * from './config/migrationSchema';
export * from './postgres';
export * from './pruning';
export * from './config/loadTesterConfig';
export * from './config/networkWideConfig';
Expand Down
11 changes: 8 additions & 3 deletions cluster/pulumi/common/src/postgres.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ export class CloudPostgres extends pulumi.ComponentResource implements Postgres
secretName: string,
cloudSqlConfig: CloudSqlConfig,
active: boolean = true,
opts: { disableProtection?: boolean; migrationId?: string; logicalDecoding?: boolean } = {}
opts: {
disableProtection?: boolean;
migrationId?: string;
logicalDecoding?: boolean;
disableBackups?: boolean;
} = {}
) {
const instanceLogicalName = xns.logicalName + '-' + instanceName;
const instanceLogicalNameAlias = xns.logicalName + '-' + alias; // pulumi name before #12391
Expand Down Expand Up @@ -93,8 +98,8 @@ export class CloudPostgres extends pulumi.ComponentResource implements Postgres
...(opts.logicalDecoding ? [{ name: 'cloudsql.logical_decoding', value: 'on' }] : []),
],
backupConfiguration: {
enabled: true,
pointInTimeRecoveryEnabled: true,
enabled: !opts.disableBackups,
pointInTimeRecoveryEnabled: !opts.disableBackups,
...(spliceConfig.pulumiProjectConfig.cloudSql.backupsToRetain
? {
backupRetentionSettings: {
Expand Down
25 changes: 25 additions & 0 deletions cluster/pulumi/gha/src/performanceTests.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { CloudPostgres, ExactNamespace } from '@lfdecentralizedtrust/splice-pulumi-common';

export function createCloudSQLInstanceForPerformanceTests(
ghaNamespace: ExactNamespace
): CloudPostgres {
return new CloudPostgres(
ghaNamespace,
'performance-test-db',
'performance-test-db',
'performance-test-db-secret',
{
enabled: true,
maintenanceWindow: { day: 2, hour: 8 },
protected: false,
tier: 'db-custom-2-7680', // same as devnet & testnet as of Jan 2026
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the actual configuration is available in the internal repo, not in this one...
that being said, it's likely we'll increase the DB size, not make it smaller, so this should be fine as baseline

enterprisePlus: false,
},
true,
{
disableProtection: true,
disableBackups: true,
logicalDecoding: false,
}
);
}
4 changes: 4 additions & 0 deletions cluster/pulumi/gha/src/runners.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ jest.mock('./config', () => ({
runnerHookVersion: '1.1',
},
}));
class FakeCloudPostgres extends pulumi.Resource {}
jest.mock('@lfdecentralizedtrust/splice-pulumi-common', () => ({
__esModule: true,
appsAffinityAndTolerations: {},
DOCKER_REPO: 'https://dummy-docker-repo.com',
HELM_MAX_HISTORY_SIZE: 42,
imagePullSecretByNamespaceNameForServiceAccount: () => [],
infraAffinityAndTolerations: {},
CloudPostgres: function CloudPostgres() {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

test below breaks without this

return new FakeCloudPostgres('CloudPostgres', 'cloud-postgres', true);
},
}));
jest.mock('@lfdecentralizedtrust/splice-pulumi-common/src/config/envConfig', () => ({
__esModule: true,
Expand Down
48 changes: 41 additions & 7 deletions cluster/pulumi/gha/src/runners.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import * as k8s from '@pulumi/kubernetes';
import {
appsAffinityAndTolerations,
CloudPostgres,
DOCKER_REPO,
ExactNamespace,
HELM_MAX_HISTORY_SIZE,
imagePullSecretByNamespaceNameForServiceAccount,
infraAffinityAndTolerations,
Expand All @@ -18,6 +20,7 @@ import yaml from 'js-yaml';

import { createCachePvc } from './cache';
import { ghaConfig } from './config';
import { createCloudSQLInstanceForPerformanceTests } from './performanceTests';

type ResourcesSpec = {
requests?: {
Expand Down Expand Up @@ -403,7 +406,8 @@ function installK8sRunnerScaleSet(
cachePvcName: string,
resources: ResourcesSpec,
serviceAccountName: string,
dependsOn: Resource[]
dependsOn: Resource[],
performanceTestsDb: CloudPostgres
): Release {
const podConfigMapName = `${name}-pod-config`;
// A configMap that will be mounted to runner pods and provide additional pod spec for the workflow pods
Expand Down Expand Up @@ -534,6 +538,21 @@ function installK8sRunnerScaleSet(
name: 'ACTIONS_RUNNER_CONTAINER_HOOK_TEMPLATE',
value: '/pod.yaml',
},
{
name: 'PERFORMANCE_TESTS_DB_HOST',
value: performanceTestsDb.address,
},
{
name: 'PERFORMANCE_TESTS_DB_USER',
value: 'cnadmin',
},
{
name: 'PERFORMANCE_TESTS_DB_PASSWORD',
valueFrom: {
key: 'postgresPassword',
name: performanceTestsDb.secretName,
},
},
],
volumeMounts: [
{
Expand Down Expand Up @@ -701,9 +720,10 @@ function installK8sRunnerScaleSets(
runnersNamespace: Namespace,
tokenSecret: Secret,
cachePvcName: string,
serviceAccountName: string
serviceAccountName: string,
performanceTestsDb: CloudPostgres
): void {
const dependsOn = [controller, runnersNamespace, tokenSecret];
const dependsOn = [controller, runnersNamespace, tokenSecret, performanceTestsDb];

runnerSpecs
.filter(spec => spec.k8s)
Expand All @@ -715,7 +735,8 @@ function installK8sRunnerScaleSets(
cachePvcName,
spec.resources,
serviceAccountName,
dependsOn
dependsOn,
performanceTestsDb
);
});
}
Expand Down Expand Up @@ -754,12 +775,17 @@ function installPodMonitor(runnersNamespace: Namespace) {
);
}

const GHA_NAMESPACE_NAME = 'gha-runners';
export function installRunnerScaleSets(controller: k8s.helm.v3.Release): void {
const runnersNamespace = new Namespace('gha-runners', {
const runnersNamespace = new Namespace(GHA_NAMESPACE_NAME, {
metadata: {
name: 'gha-runners',
name: GHA_NAMESPACE_NAME,
},
});
const exactNs: ExactNamespace = {
Copy link
Contributor

Choose a reason for hiding this comment

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

One day I'll understand why we have this ExactNamespace all over the place...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

you mean this?

// There is no way to read the logical name off a Namespace. Exactly

ns: runnersNamespace,
logicalName: GHA_NAMESPACE_NAME,
};

const tokenSecret = new k8s.core.v1.Secret(
'gh-access-token',
Expand Down Expand Up @@ -791,7 +817,15 @@ export function installRunnerScaleSets(controller: k8s.helm.v3.Release): void {
const saName = 'k8s-runners';
installRunnersServiceAccount(runnersNamespace, saName);

const performanceTestsDb = createCloudSQLInstanceForPerformanceTests(exactNs);
installDockerRunnerScaleSets(controller, runnersNamespace, tokenSecret, cachePvc, saName);
installK8sRunnerScaleSets(controller, runnersNamespace, tokenSecret, cachePvcName, saName);
installK8sRunnerScaleSets(
controller,
runnersNamespace,
tokenSecret,
cachePvcName,
saName,
performanceTestsDb
);
installPodMonitor(runnersNamespace);
}
Loading