Skip to content

Commit

Permalink
Fixing types in support for Dotnet
Browse files Browse the repository at this point in the history
  • Loading branch information
@rshade
rshade committed Feb 3, 2025
1 parent a71b02a commit 182ef58
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .pulumi.version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.147.0
3.148.0
1 change: 1 addition & 0 deletions provider/cmd/pulumi-resource-kubernetes-coredns/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"type": "array"
},
"helmOptions": {
"plain": true,
"$ref": "#/types/kubernetes-coredns:index:Release",
"description": "HelmOptions is an escape hatch that lets the end user control any aspect of the Helm deployment. This exposes the entirety of the underlying Helm Release component args."
},
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/CoreDNS.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public InputList<Pulumi.Kubernetes.Types.Inputs.Core.V1.VolumeArgs> ExtraVolumes
/// HelmOptions is an escape hatch that lets the end user control any aspect of the Helm deployment. This exposes the entirety of the underlying Helm Release component args.
/// </summary>
[Input("helmOptions")]
public Input<Inputs.ReleaseArgs>? HelmOptions { get; set; }
public Inputs.ReleaseArgs? HelmOptions { get; set; }

/// <summary>
/// Alternative configuration for HPA deployment if wanted.
Expand Down
4 changes: 2 additions & 2 deletions sdk/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.22.4

require (
github.com/blang/semver v3.5.1+incompatible
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.21.0
github.com/pulumi/pulumi/sdk/v3 v3.147.0
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.21.1
github.com/pulumi/pulumi/sdk/v3 v3.148.0
)

require (
Expand Down
8 changes: 4 additions & 4 deletions sdk/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE=
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/pulumi-kubernetes/sdk/v4 v4.21.0 h1:UedeAwQ3afL/sK0eXl1cKLnqwfu2V+TQhZCVUaNmjJE=
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.21.0/go.mod h1:RLaX8dqvWIqDV6VjScsc1tJWp1GoZ1IDSyOPIQ/y4ps=
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-kubernetes/sdk/v4 v4.21.1 h1:rDeYtMgQSf4ATFhqt33P65ulyPCbzAHFdWTyZa2iVcA=
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.21.1/go.mod h1:RLaX8dqvWIqDV6VjScsc1tJWp1GoZ1IDSyOPIQ/y4ps=
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
2 changes: 1 addition & 1 deletion sdk/go/kubernetes-coredns/coreDNS.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 3 additions & 13 deletions sdk/java/src/main/java/com/pulumi/kubernetescoredns/CoreDNSArgs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@ public Optional<Output<List<VolumeArgs>>> extraVolumes() {
*
*/
@Import(name="helmOptions")
private @Nullable Output<ReleaseArgs> helmOptions;
private @Nullable ReleaseArgs helmOptions;

/**
* @return HelmOptions is an escape hatch that lets the end user control any aspect of the Helm deployment. This exposes the entirety of the underlying Helm Release component args.
*
*/
public Optional<Output<ReleaseArgs>> helmOptions() {
public Optional<ReleaseArgs> helmOptions() {
return Optional.ofNullable(this.helmOptions);
}

Expand Down Expand Up @@ -717,21 +717,11 @@ public Builder extraVolumes(VolumeArgs... extraVolumes) {
* @return builder
*
*/
public Builder helmOptions(@Nullable Output<ReleaseArgs> helmOptions) {
public Builder helmOptions(@Nullable ReleaseArgs helmOptions) {
$.helmOptions = helmOptions;
return this;
}

/**
* @param helmOptions HelmOptions is an escape hatch that lets the end user control any aspect of the Helm deployment. This exposes the entirety of the underlying Helm Release component args.
*
* @return builder
*
*/
public Builder helmOptions(ReleaseArgs helmOptions) {
return helmOptions(Output.of(helmOptions));
}

/**
* @param hpa Alternative configuration for HPA deployment if wanted.
*
Expand Down
2 changes: 1 addition & 1 deletion sdk/nodejs/coreDNS.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export interface CoreDNSArgs {
/**
* HelmOptions is an escape hatch that lets the end user control any aspect of the Helm deployment. This exposes the entirety of the underlying Helm Release component args.
*/
helmOptions?: pulumi.Input<inputs.ReleaseArgs>;
helmOptions?: inputs.ReleaseArgs;
/**
* Alternative configuration for HPA deployment if wanted.
*/
Expand Down
12 changes: 8 additions & 4 deletions sdk/python/pulumi_kubernetes_coredns/_utilities.py
View file
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
14 changes: 7 additions & 7 deletions sdk/python/pulumi_kubernetes_coredns/core_dns.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def __init__(__self__, *,
extra_secrets: Optional[pulumi.Input[Sequence[pulumi.Input['pulumi_kubernetes.core.v1.VolumeMountArgs']]]] = None,
extra_volume_mounts: Optional[pulumi.Input[Sequence[pulumi.Input['pulumi_kubernetes.core.v1.VolumeMountArgs']]]] = None,
extra_volumes: Optional[pulumi.Input[Sequence[pulumi.Input['pulumi_kubernetes.core.v1.VolumeArgs']]]] = None,
helm_options: Optional[pulumi.Input['ReleaseArgs']] = None,
helm_options: Optional['ReleaseArgs'] = None,
hpa: Optional[pulumi.Input['CoreDNSHPAArgs']] = None,
image: Optional[pulumi.Input['CoreDNSImageArgs']] = None,
is_cluster_service: Optional[pulumi.Input[bool]] = None,
Expand Down Expand Up @@ -61,7 +61,7 @@ def __init__(__self__, *,
:param pulumi.Input[Sequence[pulumi.Input['pulumi_kubernetes.core.v1.VolumeMountArgs']]] extra_secrets: Optional array of secrets to mount inside coredns container. Possible usecase: need for secure connection with etcd backend. Optional array of mount points for extraVolumes.
:param pulumi.Input[Sequence[pulumi.Input['pulumi_kubernetes.core.v1.VolumeMountArgs']]] extra_volume_mounts: Optional array of mount points for extraVolumes.
:param pulumi.Input[Sequence[pulumi.Input['pulumi_kubernetes.core.v1.VolumeArgs']]] extra_volumes: Optional array of extra volumes to create.
:param pulumi.Input['ReleaseArgs'] helm_options: HelmOptions is an escape hatch that lets the end user control any aspect of the Helm deployment. This exposes the entirety of the underlying Helm Release component args.
:param 'ReleaseArgs' helm_options: HelmOptions is an escape hatch that lets the end user control any aspect of the Helm deployment. This exposes the entirety of the underlying Helm Release component args.
:param pulumi.Input['CoreDNSHPAArgs'] hpa: Alternative configuration for HPA deployment if wanted.
:param pulumi.Input['CoreDNSImageArgs'] image: The image to pull.
:param pulumi.Input[bool] is_cluster_service: Specifies whether chart should be deployed as cluster-service or normal k8s app.
Expand Down Expand Up @@ -231,14 +231,14 @@ def extra_volumes(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['pulu

@property
@pulumi.getter(name="helmOptions")
def helm_options(self) -> Optional[pulumi.Input['ReleaseArgs']]:
def helm_options(self) -> Optional['ReleaseArgs']:
"""
HelmOptions is an escape hatch that lets the end user control any aspect of the Helm deployment. This exposes the entirety of the underlying Helm Release component args.
"""
return pulumi.get(self, "helm_options")

@helm_options.setter
def helm_options(self, value: Optional[pulumi.Input['ReleaseArgs']]):
def helm_options(self, value: Optional['ReleaseArgs']):
pulumi.set(self, "helm_options", value)

@property
Expand Down Expand Up @@ -515,7 +515,7 @@ def __init__(__self__,
extra_secrets: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['pulumi_kubernetes.core.v1.VolumeMountArgs']]]]] = None,
extra_volume_mounts: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['pulumi_kubernetes.core.v1.VolumeMountArgs']]]]] = None,
extra_volumes: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['pulumi_kubernetes.core.v1.VolumeArgs']]]]] = None,
helm_options: Optional[pulumi.Input[Union['ReleaseArgs', 'ReleaseArgsDict']]] = None,
helm_options: Optional[Union['ReleaseArgs', 'ReleaseArgsDict']] = None,
hpa: Optional[pulumi.Input[Union['CoreDNSHPAArgs', 'CoreDNSHPAArgsDict']]] = None,
image: Optional[pulumi.Input[Union['CoreDNSImageArgs', 'CoreDNSImageArgsDict']]] = None,
is_cluster_service: Optional[pulumi.Input[bool]] = None,
Expand Down Expand Up @@ -551,7 +551,7 @@ def __init__(__self__,
:param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['pulumi_kubernetes.core.v1.VolumeMountArgs']]]] extra_secrets: Optional array of secrets to mount inside coredns container. Possible usecase: need for secure connection with etcd backend. Optional array of mount points for extraVolumes.
:param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['pulumi_kubernetes.core.v1.VolumeMountArgs']]]] extra_volume_mounts: Optional array of mount points for extraVolumes.
:param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['pulumi_kubernetes.core.v1.VolumeArgs']]]] extra_volumes: Optional array of extra volumes to create.
:param pulumi.Input[Union['ReleaseArgs', 'ReleaseArgsDict']] helm_options: HelmOptions is an escape hatch that lets the end user control any aspect of the Helm deployment. This exposes the entirety of the underlying Helm Release component args.
:param Union['ReleaseArgs', 'ReleaseArgsDict'] helm_options: HelmOptions is an escape hatch that lets the end user control any aspect of the Helm deployment. This exposes the entirety of the underlying Helm Release component args.
:param pulumi.Input[Union['CoreDNSHPAArgs', 'CoreDNSHPAArgsDict']] hpa: Alternative configuration for HPA deployment if wanted.
:param pulumi.Input[Union['CoreDNSImageArgs', 'CoreDNSImageArgsDict']] image: The image to pull.
:param pulumi.Input[bool] is_cluster_service: Specifies whether chart should be deployed as cluster-service or normal k8s app.
Expand Down Expand Up @@ -605,7 +605,7 @@ def _internal_init(__self__,
extra_secrets: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['pulumi_kubernetes.core.v1.VolumeMountArgs']]]]] = None,
extra_volume_mounts: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['pulumi_kubernetes.core.v1.VolumeMountArgs']]]]] = None,
extra_volumes: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['pulumi_kubernetes.core.v1.VolumeArgs']]]]] = None,
helm_options: Optional[pulumi.Input[Union['ReleaseArgs', 'ReleaseArgsDict']]] = None,
helm_options: Optional[Union['ReleaseArgs', 'ReleaseArgsDict']] = None,
hpa: Optional[pulumi.Input[Union['CoreDNSHPAArgs', 'CoreDNSHPAArgsDict']]] = None,
image: Optional[pulumi.Input[Union['CoreDNSImageArgs', 'CoreDNSImageArgsDict']]] = None,
is_cluster_service: Optional[pulumi.Input[bool]] = None,
Expand Down

0 comments on commit 182ef58

Please sign in to comment.