Skip to content

Commit dc82218

Browse files
authored
chore: bump pulumi-common (#3576)
1 parent c6d9a7c commit dc82218

File tree

3 files changed

+944
-134
lines changed

3 files changed

+944
-134
lines changed

.infra/index.ts

Lines changed: 7 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,6 @@ const jwtEnv = [
240240
{ name: 'JWT_PRIVATE_KEY_PATH', value: '/opt/app/cert/key.pem' },
241241
];
242242

243-
const commonEnv = [{ name: 'OTEL_SERVICE_VERSION', value: imageTag }];
244-
245243
let appsArgs: ApplicationArgs[];
246244
if (isAdhocEnv) {
247245
podAnnotations['prometheus.io/scrape'] = 'true';
@@ -261,7 +259,6 @@ if (isAdhocEnv) {
261259
value: 'true',
262260
},
263261
{ name: 'ENABLE_PRIVATE_ROUTES', value: 'true' },
264-
...commonEnv,
265262
...jwtEnv,
266263
],
267264
minReplicas: 3,
@@ -300,14 +297,7 @@ if (isAdhocEnv) {
300297
ports: [{ containerPort: 9464, name: 'metrics' }],
301298
servicePorts: [{ targetPort: 9464, port: 9464, name: 'metrics' }],
302299
podAnnotations: podAnnotations,
303-
env: [
304-
{
305-
name: 'OTEL_SERVICE_NAME',
306-
value: `${envVars.otelServiceName as string}-bg`,
307-
},
308-
...commonEnv,
309-
...jwtEnv,
310-
],
300+
env: [...jwtEnv],
311301
...vols,
312302
},
313303
];
@@ -331,14 +321,14 @@ if (isAdhocEnv) {
331321
ports: [{ containerPort: 9464, name: 'metrics' }],
332322
servicePorts: [{ targetPort: 9464, port: 9464, name: 'metrics' }],
333323
podAnnotations: podAnnotations,
334-
env: [...commonEnv, ...jwtEnv],
324+
env: [...jwtEnv],
335325
...vols,
336326
});
337327
}
338328
} else {
339329
appsArgs = [
340330
{
341-
env: [nodeOptions(memory), ...commonEnv, ...jwtEnv],
331+
env: [nodeOptions(memory), ...jwtEnv],
342332
minReplicas: 3,
343333
maxReplicas: 25,
344334
limits: apiLimits,
@@ -370,12 +360,7 @@ if (isAdhocEnv) {
370360
env: [
371361
nodeOptions(wsMemory),
372362
{ name: 'ENABLE_SUBSCRIPTIONS', value: 'true' },
373-
...commonEnv,
374363
...jwtEnv,
375-
{
376-
name: 'OTEL_SERVICE_NAME',
377-
value: `${envVars.otelServiceName as string}-ws`,
378-
},
379364
],
380365
args: ['dumb-init', 'node', 'bin/cli', 'websocket'],
381366
minReplicas: 2,
@@ -392,14 +377,7 @@ if (isAdhocEnv) {
392377
},
393378
{
394379
nameSuffix: 'bg',
395-
env: [
396-
...commonEnv,
397-
...jwtEnv,
398-
{
399-
name: 'OTEL_SERVICE_NAME',
400-
value: `${envVars.otelServiceName as string}-bg`,
401-
},
402-
],
380+
env: [...jwtEnv],
403381
args: ['dumb-init', 'node', 'bin/cli', 'background'],
404382
minReplicas: 2,
405383
maxReplicas: 10,
@@ -421,7 +399,7 @@ if (isAdhocEnv) {
421399
},
422400
{
423401
nameSuffix: 'temporal',
424-
env: [...commonEnv, ...jwtEnv],
402+
env: [...jwtEnv],
425403
args: ['dumb-init', 'node', 'bin/cli', 'temporal'],
426404
minReplicas: 1,
427405
maxReplicas: 3,
@@ -437,15 +415,7 @@ if (isAdhocEnv) {
437415
{
438416
nameSuffix: 'private',
439417
port: 3000,
440-
env: [
441-
{ name: 'ENABLE_PRIVATE_ROUTES', value: 'true' },
442-
...commonEnv,
443-
...jwtEnv,
444-
{
445-
name: 'OTEL_SERVICE_NAME',
446-
value: `${envVars.otelServiceName as string}-private`,
447-
},
448-
],
418+
env: [{ name: 'ENABLE_PRIVATE_ROUTES', value: 'true' }, ...jwtEnv],
449419
minReplicas: 1,
450420
maxReplicas: 4,
451421
requests: {
@@ -469,14 +439,7 @@ if (isAdhocEnv) {
469439
if (isPersonalizedDigestEnabled) {
470440
appsArgs.push({
471441
nameSuffix: 'personalized-digest',
472-
env: [
473-
...commonEnv,
474-
...jwtEnv,
475-
{
476-
name: 'OTEL_SERVICE_NAME',
477-
value: `${envVars.otelServiceName as string}-personalized-digest`,
478-
},
479-
],
442+
env: [...jwtEnv],
480443
args: ['dumb-init', 'node', 'bin/cli', 'personalized-digest'],
481444
minReplicas: 1,
482445
maxReplicas: 4,

.infra/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@types/node": "22.15.x"
88
},
99
"dependencies": {
10-
"@dailydotdev/pulumi-common": "^2.17.1",
10+
"@dailydotdev/pulumi-common": "2.17.6",
1111
"@pulumi/gcp": "^9.6.0",
1212
"@pulumi/kubernetes": "^4.24.1",
1313
"@pulumi/pulumi": "^3.209.0"

0 commit comments

Comments
 (0)