Skip to content
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.

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

Update first-party Pulumi dependencies #3462

Merged
merged 2 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ require (
github.com/pkg/errors v0.9.1
github.com/pulumi/cloud-ready-checks v1.2.0
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.21.1
github.com/pulumi/pulumi/pkg/v3 v3.147.0
github.com/pulumi/pulumi/sdk/v3 v3.147.0
github.com/pulumi/pulumi/pkg/v3 v3.148.0
github.com/pulumi/pulumi/sdk/v3 v3.148.0
github.com/stretchr/testify v1.10.0
golang.org/x/crypto v0.31.0
golang.org/x/exp v0.0.0-20241210194714-1829a127f884
Expand Down
8 changes: 4 additions & 4 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -683,10 +683,10 @@ github.com/pulumi/esc v0.10.0 h1:jzBKzkLVW0mePeanDRfqSQoCJ5yrkux0jIwAkUxpRKE=
github.com/pulumi/esc v0.10.0/go.mod h1:2Bfa+FWj/xl8CKqRTWbWgDX0SOD4opdQgvYSURTGK2c=
github.com/pulumi/inflector v0.1.1 h1:dvlxlWtXwOJTUUtcYDvwnl6Mpg33prhK+7mzeF+SobA=
github.com/pulumi/inflector v0.1.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY=
github.com/pulumi/pulumi/pkg/v3 v3.147.0 h1:aFzP2kXBL/nPPDao625xIkjAhqT5GKe3XfPXbG07oFA=
github.com/pulumi/pulumi/pkg/v3 v3.147.0/go.mod h1:WqLJy8lfzbGTEqz5Rukd+GrqBYNBf8Y3dJ+Wde+G6g4=
github.com/pulumi/pulumi/sdk/v3 v3.147.0 h1:8ZDZnEsCZa6shw1dwIDUssbYMooYyebhpmx5feuZCqM=
github.com/pulumi/pulumi/sdk/v3 v3.147.0/go.mod h1:+WC9aIDo8fMgd2g0jCHuZU2S/VYNLRAZ3QXt6YVgwaA=
github.com/pulumi/pulumi/pkg/v3 v3.148.0 h1:7FuRpw1ysvt5400x+5Ukbj14ue5W8b9fI+FZ8YMD7o4=
github.com/pulumi/pulumi/pkg/v3 v3.148.0/go.mod h1:xxL0LnlNmjotV8Kz3sKITKCQf+U72prabgt4NAlJfRk=
github.com/pulumi/pulumi/sdk/v3 v3.148.0 h1:tEw1FQOKoQVP7HfZWI9DJQl4ZvGaL1z2ixZdN2wGV/o=
github.com/pulumi/pulumi/sdk/v3 v3.148.0/go.mod h1:+WC9aIDo8fMgd2g0jCHuZU2S/VYNLRAZ3QXt6YVgwaA=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
Expand Down
12 changes: 8 additions & 4 deletions sdk/python/pulumi_kubernetes/_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,16 @@ def _get_semver_version():
elif pep440_version.pre_tag == 'rc':
prerelease = f"rc.{pep440_version.pre}"
elif pep440_version.dev is not None:
# PEP440 has explicit support for dev builds, while semver encodes them as "prerelease" versions. To bridge
# between the two, we convert our dev build version into a prerelease tag. This matches what all of our other
# packages do when constructing their own semver string.
prerelease = f"dev.{pep440_version.dev}"
elif pep440_version.local is not None:
# PEP440 only allows a small set of prerelease tags, so when converting an arbitrary prerelease,
# PypiVersion in /pkg/codegen/python/utilities.go converts it to a local version. Therefore, we need to
# do the reverse conversion here and set the local version as the prerelease tag.
prerelease = pep440_version.local

# The only significant difference between PEP440 and semver as it pertains to us is that PEP440 has explicit support
# for dev builds, while semver encodes them as "prerelease" versions. In order to bridge between the two, we convert
# our dev build version into a prerelease tag. This matches what all of our other packages do when constructing
# their own semver string.
return SemverVersion(major=major, minor=minor, patch=patch, prerelease=prerelease)


Expand Down
4 changes: 2 additions & 2 deletions tests/ci-cluster/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"@types/node": "latest"
},
"dependencies": {
"@pulumi/gcp": "8.15.0",
"@pulumi/gcp": "8.16.0",
"@pulumi/kubernetes": "4.21.1",
"@pulumi/pulumi": "3.147.0"
"@pulumi/pulumi": "3.148.0"
}
}
4 changes: 2 additions & 2 deletions tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ require (
github.com/pulumi/providertest v0.1.5
github.com/pulumi/pulumi-kubernetes/provider/v4 v4.0.0
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.21.1
github.com/pulumi/pulumi/pkg/v3 v3.147.0
github.com/pulumi/pulumi/sdk/v3 v3.147.0
github.com/pulumi/pulumi/pkg/v3 v3.148.0
github.com/pulumi/pulumi/sdk/v3 v3.148.0
github.com/pulumiverse/pulumi-time/sdk v0.0.0-20231010123146-089d7304da13
github.com/stretchr/testify v1.10.0
golang.org/x/exp v0.0.0-20241210194714-1829a127f884
Expand Down
8 changes: 4 additions & 4 deletions tests/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -629,10 +629,10 @@ github.com/pulumi/esc v0.10.0 h1:jzBKzkLVW0mePeanDRfqSQoCJ5yrkux0jIwAkUxpRKE=
github.com/pulumi/esc v0.10.0/go.mod h1:2Bfa+FWj/xl8CKqRTWbWgDX0SOD4opdQgvYSURTGK2c=
github.com/pulumi/providertest v0.1.5 h1:35PH+SBNzWjkfO/rP5mSjrfuTUJZ5nxeo2Cb845EoYU=
github.com/pulumi/providertest v0.1.5/go.mod h1:bU07oPwpgNjGuuIT6CPnI/eLXaGHqhypFrxX5ZsABo4=
github.com/pulumi/pulumi/pkg/v3 v3.147.0 h1:aFzP2kXBL/nPPDao625xIkjAhqT5GKe3XfPXbG07oFA=
github.com/pulumi/pulumi/pkg/v3 v3.147.0/go.mod h1:WqLJy8lfzbGTEqz5Rukd+GrqBYNBf8Y3dJ+Wde+G6g4=
github.com/pulumi/pulumi/sdk/v3 v3.147.0 h1:8ZDZnEsCZa6shw1dwIDUssbYMooYyebhpmx5feuZCqM=
github.com/pulumi/pulumi/sdk/v3 v3.147.0/go.mod h1:+WC9aIDo8fMgd2g0jCHuZU2S/VYNLRAZ3QXt6YVgwaA=
github.com/pulumi/pulumi/pkg/v3 v3.148.0 h1:7FuRpw1ysvt5400x+5Ukbj14ue5W8b9fI+FZ8YMD7o4=
github.com/pulumi/pulumi/pkg/v3 v3.148.0/go.mod h1:xxL0LnlNmjotV8Kz3sKITKCQf+U72prabgt4NAlJfRk=
github.com/pulumi/pulumi/sdk/v3 v3.148.0 h1:tEw1FQOKoQVP7HfZWI9DJQl4ZvGaL1z2ixZdN2wGV/o=
github.com/pulumi/pulumi/sdk/v3 v3.148.0/go.mod h1:+WC9aIDo8fMgd2g0jCHuZU2S/VYNLRAZ3QXt6YVgwaA=
github.com/pulumiverse/pulumi-time/sdk v0.0.0-20231010123146-089d7304da13 h1:4U7DFIlSggj/4iLbis2Bckayed+OhaYKE7bncZwQCYI=
github.com/pulumiverse/pulumi-time/sdk v0.0.0-20231010123146-089d7304da13/go.mod h1:NUa1zA74DF002WrM6iF111A6UjX9knPpXufVRvBwNyg=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/pulumi": "3.147.0",
"@pulumi/pulumi": "3.148.0",
"@pulumi/kubernetes": "latest"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@types/node": "^14"
},
"dependencies": {
"@pulumi/pulumi": "3.147.0",
"@pulumi/pulumi": "3.148.0",
"@pulumi/kubernetes": "4.21.1",
"@pulumi/kubernetesx": "0.1.6"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/pulumi": "3.147.0",
"@pulumi/pulumi": "3.148.0",
"@pulumi/kubernetes": "latest",
"@pulumi/kubernetesx": "0.1.6"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/pulumi": "3.147.0",
"@pulumi/pulumi": "3.148.0",
"@pulumi/kubernetes": "latest",
"@pulumi/kubernetesx": "0.1.6"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/pulumi": "3.147.0",
"@pulumi/pulumi": "3.148.0",
"@pulumi/kubernetes": "latest",
"@pulumi/kubernetesx": "0.1.6",
"@pulumi/random": "4.17.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/sdk/nodejs/examples/helm-release/step1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/pulumi": "3.147.0",
"@pulumi/pulumi": "3.148.0",
"@pulumi/kubernetes": "latest",
"@pulumi/kubernetesx": "0.1.6"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/sdk/nodejs/helm-preview-unreachable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/pulumi": "3.147.0",
"@pulumi/pulumi": "3.148.0",
"@pulumi/kubernetes": "latest",
"@pulumi/random": "4.17.0"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/sdk/nodejs/helm-release-unknowns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@types/node": "^10.0.0"
},
"dependencies": {
"@pulumi/pulumi": "3.147.0",
"@pulumi/pulumi": "3.148.0",
"@pulumi/kubernetes": "latest",
"@pulumi/kubernetesx": "0.1.6",
"@pulumi/random": "4.17.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/sdk/nodejs/options/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"@types/node": "^16"
},
"dependencies": {
"@pulumi/pulumi": "3.147.0",
"@pulumi/pulumi": "3.148.0",
"@pulumi/kubernetes": "4.21.1",
"@pulumiverse/time": "^0.0.16"
}
Expand Down
Loading