Skip to content

revert: recent pulumi changes #3482

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
omBratteng merged 1 commit into from
Jan 22, 2026
Merged

revert: recent pulumi changes #3482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .infra/Pulumi.adhoc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,6 @@ config:
mockExternalServices: true
api:k8s:
namespace: local
api:temporal:
chain: ''
key: ''
9 changes: 7 additions & 2 deletions .infra/Pulumi.prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ config:
submitArticleThreshold: 250
temporalAddress:
secure: AAABANwsKzHI+0YqeyYAYySZLL0vAIPZaiKEofEpe8cyj9foEnhVI1rhGT/t4uhvGv94kXHsa34jaQ==
temporalClientCertPath: /var/run/autocert.step.sm/site.crt
temporalClientKeyPath: /var/run/autocert.step.sm/site.key
temporalClientCertPath: /opt/app/temporal/chain.pem
temporalClientKeyPath: /opt/app/temporal/key.pem
temporalNamespace:
secure: AAABAH2U+6PzqY4WvKmvxfcxqEu1lSkcuFbH/9BQNVfhlGGEMDqQCNg=
typeormDatabase:
Expand Down Expand Up @@ -211,5 +211,10 @@ config:
api:k8s:
host: subs.daily.dev
namespace: daily
api:temporal:
chain:
secure: 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
key:
secure: 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
gcp:project: devkit-prod
gcp:region: us-central1
17 changes: 11 additions & 6 deletions .infra/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@ const additionalSecrets: AdditionalSecret[] = [];
const vols: VolsType = {
volumes: [
{ name: 'cert', secret: { secretName: 'cert-secret' } },
{ name: 'temporal', secret: { secretName: 'temporal-secret' } },
],
volumeMounts: [
{ name: 'cert', mountPath: '/opt/app/cert' },
{ name: 'temporal', mountPath: '/opt/app/temporal' },
],
};

Expand Down Expand Up @@ -196,6 +198,8 @@ const livenessProbe: k8s.types.input.core.v1.Probe = {
initialDelaySeconds,
};

const temporalCert = config.requireObject<Record<string, string>>('temporal');

type VolsType = {
volumes: k8s.types.input.core.v1.Volume[];
volumeMounts: k8s.types.input.core.v1.VolumeMount[];
Expand Down Expand Up @@ -358,7 +362,6 @@ if (isAdhocEnv) {
customRequestHeaders: ['X-Client-Region:{client_region}'],
},
podAnnotations: podAnnotations,
certificate: { enabled: true },
...vols,
},
{
Expand All @@ -385,7 +388,6 @@ if (isAdhocEnv) {
disableLifecycle: true,
spot: { enabled: true },
podAnnotations: podAnnotations,
certificate: { enabled: true },
...vols,
},
{
Expand Down Expand Up @@ -415,7 +417,6 @@ if (isAdhocEnv) {
servicePorts: [{ targetPort: 9464, port: 9464, name: 'metrics' }],
spot: { enabled: true },
podAnnotations: podAnnotations,
certificate: { enabled: true },
...vols,
},
{
Expand All @@ -430,7 +431,6 @@ if (isAdhocEnv) {
ports: [{ containerPort: 9464, name: 'metrics' }],
servicePorts: [{ targetPort: 9464, port: 9464, name: 'metrics' }],
spot: { enabled: true },
certificate: { enabled: true },
podAnnotations: podAnnotations,
...vols,
},
Expand Down Expand Up @@ -462,7 +462,6 @@ if (isAdhocEnv) {
serviceType: 'ClusterIP',
disableLifecycle: true,
podAnnotations: podAnnotations,
certificate: { enabled: true },
...vols,
},
];
Expand Down Expand Up @@ -493,7 +492,6 @@ if (isAdhocEnv) {
},
spot: { enabled: true },
podAnnotations: podAnnotations,
certificate: { enabled: true },
...vols,
});
}
Expand Down Expand Up @@ -566,6 +564,13 @@ const [apps] = deployApplicationSuite(
'key.pem': Buffer.from(cert.key).toString('base64'),
},
},
{
name: 'temporal-secret',
data: {
'chain.pem': Buffer.from(temporalCert.chain).toString('base64'),
'key.pem': Buffer.from(temporalCert.key).toString('base64'),
},
},
...additionalSecrets,
],
apps: appsArgs,
Expand Down
8 changes: 4 additions & 4 deletions .infra/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"@types/node": "22.15.x"
},
"dependencies": {
"@dailydotdev/pulumi-common": "^2.19.0",
"@pulumi/gcp": "^9.10.0",
"@pulumi/kubernetes": "^4.25.0",
"@pulumi/pulumi": "^3.216.0"
"@dailydotdev/pulumi-common": "^2.17.1",
"@pulumi/gcp": "^9.6.0",
"@pulumi/kubernetes": "^4.24.1",
"@pulumi/pulumi": "^3.209.0"
},
"packageManager": "pnpm@9.14.4+sha256.26a726b633b629a3fabda006f696ae4260954a3632c8054112d7ae89779e5f9a",
"volta": {
Expand Down
Loading
Loading