Skip to content

Commit de7e4a2

Browse files
nicu-danicu-da
committed
Bump nixpkg and pulumi
[static] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
1 parent 09f2bb8 commit de7e4a2

File tree

12 files changed

+80
-118
lines changed

12 files changed

+80
-118
lines changed

‎cluster/expected/deployment/expected.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
}
226226
}
227227
],
228-
"image": "pulumi/pulumi:3.147.0-nonroot",
228+
"image": "pulumi/pulumi:0.0.0-nonroot",
229229
"podTemplate": {
230230
"spec": {
231231
"affinity": {
@@ -559,7 +559,7 @@
559559
}
560560
}
561561
],
562-
"image": "pulumi/pulumi:3.147.0-nonroot",
562+
"image": "pulumi/pulumi:0.0.0-nonroot",
563563
"podTemplate": {
564564
"spec": {
565565
"affinity": {
@@ -843,7 +843,7 @@
843843
}
844844
}
845845
],
846-
"image": "pulumi/pulumi:3.147.0-nonroot",
846+
"image": "pulumi/pulumi:0.0.0-nonroot",
847847
"podTemplate": {
848848
"spec": {
849849
"affinity": {
@@ -1587,7 +1587,7 @@
15871587
}
15881588
}
15891589
],
1590-
"image": "pulumi/pulumi:3.147.0-nonroot",
1590+
"image": "pulumi/pulumi:0.0.0-nonroot",
15911591
"podTemplate": {
15921592
"spec": {
15931593
"affinity": {
@@ -1871,7 +1871,7 @@
18711871
}
18721872
}
18731873
],
1874-
"image": "pulumi/pulumi:3.147.0-nonroot",
1874+
"image": "pulumi/pulumi:0.0.0-nonroot",
18751875
"podTemplate": {
18761876
"spec": {
18771877
"affinity": {
@@ -2155,7 +2155,7 @@
21552155
}
21562156
}
21572157
],
2158-
"image": "pulumi/pulumi:3.147.0-nonroot",
2158+
"image": "pulumi/pulumi:0.0.0-nonroot",
21592159
"podTemplate": {
21602160
"spec": {
21612161
"affinity": {
@@ -2451,7 +2451,7 @@
24512451
}
24522452
}
24532453
],
2454-
"image": "pulumi/pulumi:3.147.0-nonroot",
2454+
"image": "pulumi/pulumi:0.0.0-nonroot",
24552455
"podTemplate": {
24562456
"spec": {
24572457
"affinity": {
@@ -2747,7 +2747,7 @@
27472747
}
27482748
}
27492749
],
2750-
"image": "pulumi/pulumi:3.147.0-nonroot",
2750+
"image": "pulumi/pulumi:0.0.0-nonroot",
27512751
"podTemplate": {
27522752
"spec": {
27532753
"affinity": {
@@ -3031,7 +3031,7 @@
30313031
}
30323032
}
30333033
],
3034-
"image": "pulumi/pulumi:3.147.0-nonroot",
3034+
"image": "pulumi/pulumi:0.0.0-nonroot",
30353035
"podTemplate": {
30363036
"spec": {
30373037
"affinity": {
@@ -3315,7 +3315,7 @@
33153315
}
33163316
}
33173317
],
3318-
"image": "pulumi/pulumi:3.147.0-nonroot",
3318+
"image": "pulumi/pulumi:0.0.0-nonroot",
33193319
"podTemplate": {
33203320
"spec": {
33213321
"affinity": {
@@ -3611,7 +3611,7 @@
36113611
}
36123612
}
36133613
],
3614-
"image": "pulumi/pulumi:3.147.0-nonroot",
3614+
"image": "pulumi/pulumi:0.0.0-nonroot",
36153615
"podTemplate": {
36163616
"spec": {
36173617
"affinity": {
@@ -3907,7 +3907,7 @@
39073907
}
39083908
}
39093909
],
3910-
"image": "pulumi/pulumi:3.147.0-nonroot",
3910+
"image": "pulumi/pulumi:0.0.0-nonroot",
39113911
"podTemplate": {
39123912
"spec": {
39133913
"affinity": {
@@ -4193,7 +4193,7 @@
41934193
}
41944194
}
41954195
],
4196-
"image": "pulumi/pulumi:3.147.0-nonroot",
4196+
"image": "pulumi/pulumi:0.0.0-nonroot",
41974197
"podTemplate": {
41984198
"spec": {
41994199
"affinity": {
@@ -4479,7 +4479,7 @@
44794479
}
44804480
}
44814481
],
4482-
"image": "pulumi/pulumi:3.147.0-nonroot",
4482+
"image": "pulumi/pulumi:0.0.0-nonroot",
44834483
"podTemplate": {
44844484
"spec": {
44854485
"affinity": {
@@ -4777,7 +4777,7 @@
47774777
}
47784778
}
47794779
],
4780-
"image": "pulumi/pulumi:3.147.0-nonroot",
4780+
"image": "pulumi/pulumi:0.0.0-nonroot",
47814781
"podTemplate": {
47824782
"spec": {
47834783
"affinity": {
@@ -5075,7 +5075,7 @@
50755075
}
50765076
}
50775077
],
5078-
"image": "pulumi/pulumi:3.147.0-nonroot",
5078+
"image": "pulumi/pulumi:0.0.0-nonroot",
50795079
"podTemplate": {
50805080
"spec": {
50815081
"affinity": {
@@ -5361,7 +5361,7 @@
53615361
}
53625362
}
53635363
],
5364-
"image": "pulumi/pulumi:3.147.0-nonroot",
5364+
"image": "pulumi/pulumi:0.0.0-nonroot",
53655365
"podTemplate": {
53665366
"spec": {
53675367
"affinity": {
@@ -5653,7 +5653,7 @@
56535653
}
56545654
}
56555655
],
5656-
"image": "pulumi/pulumi:3.147.0-nonroot",
5656+
"image": "pulumi/pulumi:0.0.0-nonroot",
56575657
"podTemplate": {
56585658
"spec": {
56595659
"affinity": {
@@ -5937,7 +5937,7 @@
59375937
}
59385938
}
59395939
],
5940-
"image": "pulumi/pulumi:3.147.0-nonroot",
5940+
"image": "pulumi/pulumi:0.0.0-nonroot",
59415941
"podTemplate": {
59425942
"spec": {
59435943
"affinity": {
@@ -6229,7 +6229,7 @@
62296229
}
62306230
}
62316231
],
6232-
"image": "pulumi/pulumi:3.147.0-nonroot",
6232+
"image": "pulumi/pulumi:0.0.0-nonroot",
62336233
"podTemplate": {
62346234
"spec": {
62356235
"affinity": {

‎cluster/expected/infra/expected.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3980,7 +3980,6 @@
39803980
"custom": true,
39813981
"id": "",
39823982
"inputs": {
3983-
"addPreviousOutputInEnv": true,
39843983
"create": "bash SPLICE_ROOT/cluster/pulumi/infra/prometheus-crd-update.sh 0.85.0"
39853984
},
39863985
"name": "update-prometheus-crd-0.85.0",

‎cluster/expected/operator/expected.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
}
260260
}
261261
],
262-
"image": "pulumi/pulumi:3.147.0-nonroot",
262+
"image": "pulumi/pulumi:0.0.0-nonroot",
263263
"podTemplate": {
264264
"spec": {
265265
"affinity": {

‎cluster/expected/splitwell/expected.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@
398398
"__pulumiResource": true,
399399
"__pulumiType": "kubernetes:core/v1:Secret",
400400
"__transformations": [],
401-
"__version": "4.23.0",
401+
"__version": "4.25.0",
402402
"apiVersion": "Calling [toJSON] on an [Output<T>] is not supported.\n\nTo get the value of an Output as a JSON value or JSON string consider either:\n 1: o.apply(v => v.toJSON())\n 2: o.apply(v => JSON.stringify(v))\n\nSee https://www.pulumi.com/docs/concepts/inputs-outputs for more details.\nThis function may throw in a future version of @pulumi/pulumi.",
403403
"data": "Calling [toJSON] on an [Output<T>] is not supported.\n\nTo get the value of an Output as a JSON value or JSON string consider either:\n 1: o.apply(v => v.toJSON())\n 2: o.apply(v => JSON.stringify(v))\n\nSee https://www.pulumi.com/docs/concepts/inputs-outputs for more details.\nThis function may throw in a future version of @pulumi/pulumi.",
404404
"id": "Calling [toJSON] on an [Output<T>] is not supported.\n\nTo get the value of an Output as a JSON value or JSON string consider either:\n 1: o.apply(v => v.toJSON())\n 2: o.apply(v => JSON.stringify(v))\n\nSee https://www.pulumi.com/docs/concepts/inputs-outputs for more details.\nThis function may throw in a future version of @pulumi/pulumi.",
@@ -417,7 +417,7 @@
417417
"__pulumiResource": true,
418418
"__pulumiType": "kubernetes:core/v1:ServiceAccountPatch",
419419
"__transformations": [],
420-
"__version": "4.23.0",
420+
"__version": "4.25.0",
421421
"apiVersion": "Calling [toJSON] on an [Output<T>] is not supported.\n\nTo get the value of an Output as a JSON value or JSON string consider either:\n 1: o.apply(v => v.toJSON())\n 2: o.apply(v => JSON.stringify(v))\n\nSee https://www.pulumi.com/docs/concepts/inputs-outputs for more details.\nThis function may throw in a future version of @pulumi/pulumi.",
422422
"automountServiceAccountToken": "Calling [toJSON] on an [Output<T>] is not supported.\n\nTo get the value of an Output as a JSON value or JSON string consider either:\n 1: o.apply(v => v.toJSON())\n 2: o.apply(v => JSON.stringify(v))\n\nSee https://www.pulumi.com/docs/concepts/inputs-outputs for more details.\nThis function may throw in a future version of @pulumi/pulumi.",
423423
"id": "Calling [toJSON] on an [Output<T>] is not supported.\n\nTo get the value of an Output as a JSON value or JSON string consider either:\n 1: o.apply(v => v.toJSON())\n 2: o.apply(v => JSON.stringify(v))\n\nSee https://www.pulumi.com/docs/concepts/inputs-outputs for more details.\nThis function may throw in a future version of @pulumi/pulumi.",

‎cluster/pulumi/common/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependencies": {
66
"@google-cloud/storage": "^7.18.0",
77
"@kubernetes/client-node": "^0.22.3",
8-
"@pulumi/command": "1.1.0",
8+
"@pulumi/command": "1.1.3",
99
"@pulumi/gcp": "^9.10.0",
10-
"@pulumi/kubernetes": "4.23.0",
10+
"@pulumi/kubernetes": "4.25.0",
1111
"@pulumi/pulumi": "3.202.0",
12-
"@pulumi/random": "4.18.2",
12+
"@pulumi/random": "4.19.0",
1313
"@pulumi/std": "2.2.0",
1414
"@types/auth0": "^3.3.11",
1515
"auth0": "^4.28.0",

‎cluster/pulumi/common/src/operator/stack.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33
import * as k8s from '@pulumi/kubernetes';
44
import * as pulumi from '@pulumi/pulumi';
5-
import * as semver from 'semver';
65
import {
76
CLUSTER_BASENAME,
87
config,
@@ -139,9 +138,6 @@ export function createStackCR(
139138
}
140139
: {};
141140
const pulumiVersion = spliceEnvConfig.requireEnv('PULUMI_VERSION');
142-
// required because the docker images are broken
143-
// TODO(#15978): remove this once pulumi is upgraded
144-
const minimumPulumiVersionRequired = '3.147.0';
145141
return new k8s.apiextensions.CustomResource(
146142
name,
147143
{
@@ -221,7 +217,7 @@ export function createStackCR(
221217
deletionGracePeriodSeconds: PulumiOperatorGracePeriod,
222218
},
223219
spec: {
224-
image: `pulumi/pulumi:${semver.gt(pulumiVersion, minimumPulumiVersionRequired) ? pulumiVersion : minimumPulumiVersionRequired}-nonroot`,
220+
image: `pulumi/pulumi:${pulumiVersion}-nonroot`,
225221
env: [
226222
{
227223
name: 'CN_PULUMI_LOAD_ENV_CONFIG_FILE',

‎cluster/pulumi/infra/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"name": "@lfdecentralizedtrust/splice-pulumi-infra",
33
"main": "src/index.ts",
44
"dependencies": {
5-
"@pulumi/auth0": "3.21.0",
5+
"@pulumi/auth0": "3.36.0",
66
"@pulumi/kubernetes-cert-manager": "0.2.0",
77
"@pulumiverse/grafana": "0.16.3",
88
"@lfdecentralizedtrust/splice-pulumi-common": "1.0.0"
99
},
1010
"overrides": {
1111
"@pulumi/kubernetes-cert-manager": {
12-
"@pulumi/kubernetes": "4.21.1"
12+
"@pulumi/kubernetes": "4.25.0"
1313
}
1414
},
1515
"scripts": {

0 commit comments

Comments
 (0)