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.

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

Jump to bottom

Update dependencies #1480

Merged
merged 2 commits into from
Mar 1, 2021
Merged

Update dependencies #1480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
860dd7d
Update dependencies
komalali Mar 1, 2021
9f60fbb
Update changelog
komalali Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## HEAD (Unreleased)

- Fix bug where rendering manifests results in files being overwritten by subsequent resources with the same kind and name, but different namespace (https://github.com/pulumi/pulumi-kubernetes/pull/1429)
- Update pulumi dependency to fix python Resource.get() functions (https://github.com/pulumi/pulumi-kubernetes/pull/1480)

## 2.8.2 (February 23, 2021)

Expand Down
4 changes: 2 additions & 2 deletions provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require (
github.com/onsi/ginkgo v1.12.0 // indirect
github.com/onsi/gomega v1.9.0 // indirect
github.com/pkg/errors v0.9.1
github.com/pulumi/pulumi/pkg/v2 v2.18.3-0.20210126224412-216fd2bed529
github.com/pulumi/pulumi/sdk/v2 v2.18.3-0.20210126224412-216fd2bed529
github.com/pulumi/pulumi/pkg/v2 v2.21.3-0.20210301175425-8616390418f8
github.com/pulumi/pulumi/sdk/v2 v2.21.3-0.20210301175425-8616390418f8
github.com/stretchr/testify v1.7.0
google.golang.org/grpc v1.29.1
helm.sh/helm/v3 v3.5.2
Expand Down
4 changes: 4 additions & 0 deletions provider/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,9 +922,13 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/pulumi/pulumi/pkg/v2 v2.18.3-0.20210126224412-216fd2bed529 h1:eWGiFS3P+Nw/gG/MSlOiAsRT/ssEi/fh/q1KS9qe8Q8=
github.com/pulumi/pulumi/pkg/v2 v2.18.3-0.20210126224412-216fd2bed529/go.mod h1:bAbzFeU3gHu1diqcckqUqaFf5dP02BfJlP8dnHwm00k=
github.com/pulumi/pulumi/pkg/v2 v2.21.3-0.20210301175425-8616390418f8 h1:2c2BD7F4dn8WR6+nNPPAm0tsFvK9N6JL//EWTPscWnA=
github.com/pulumi/pulumi/pkg/v2 v2.21.3-0.20210301175425-8616390418f8/go.mod h1:bAbzFeU3gHu1diqcckqUqaFf5dP02BfJlP8dnHwm00k=
github.com/pulumi/pulumi/sdk/v2 v2.2.1/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
github.com/pulumi/pulumi/sdk/v2 v2.18.3-0.20210126224412-216fd2bed529 h1:PKX++TRfU+a8tG0MajO/ghxEU0DxC8vpc+q9jsXkts4=
github.com/pulumi/pulumi/sdk/v2 v2.18.3-0.20210126224412-216fd2bed529/go.mod h1:fCFhRV6NmidWetmgDPA76efL+s0JqLlS54JJIwfOt+o=
github.com/pulumi/pulumi/sdk/v2 v2.21.3-0.20210301175425-8616390418f8 h1:nAzbkTv/J/z/oK2EfUzvV1OovbbnIBalW5CHJbNEp/s=
github.com/pulumi/pulumi/sdk/v2 v2.21.3-0.20210301175425-8616390418f8/go.mod h1:fCFhRV6NmidWetmgDPA76efL+s0JqLlS54JJIwfOt+o=
github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA=
github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Pulumi.Kubernetes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<ItemGroup>
<EmbeddedResource Include="version.txt" />
<Content Include="version.txt" />
<None Include="version.txt" Pack="True" PackagePath="content" />
</ItemGroup>

<ItemGroup>
Expand Down
11 changes: 4 additions & 7 deletions sdk/nodejs/admissionregistration/v1/mutatingWebhookConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ export class MutatingWebhookConfiguration extends pulumi.CustomResource {
*/
constructor(name: string, args?: MutatingWebhookConfigurationArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
opts = opts || {};
if (!opts.id) {
inputs["apiVersion"] = "admissionregistration.k8s.io/v1";
inputs["kind"] = "MutatingWebhookConfiguration";
inputs["metadata"] = args ? args.metadata : undefined;
Expand All @@ -72,15 +73,11 @@ export class MutatingWebhookConfiguration extends pulumi.CustomResource {
inputs["metadata"] = undefined /*out*/;
inputs["webhooks"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
const aliasOpts = { aliases: [{ type: "kubernetes:admissionregistration.k8s.io/v1beta1:MutatingWebhookConfiguration" }] };
opts = opts ? pulumi.mergeOptions(opts, aliasOpts) : aliasOpts;
opts = pulumi.mergeOptions(opts, aliasOpts);
super(MutatingWebhookConfiguration.__pulumiType, name, inputs, opts);
}
}
Expand Down
11 changes: 4 additions & 7 deletions sdk/nodejs/admissionregistration/v1/mutatingWebhookConfigurationList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ export class MutatingWebhookConfigurationList extends pulumi.CustomResource {
*/
constructor(name: string, args?: MutatingWebhookConfigurationListArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
if ((!args || args.items === undefined) && !(opts && opts.urn)) {
opts = opts || {};
if (!opts.id) {
if ((!args || args.items === undefined) && !opts.urn) {
throw new Error("Missing required property 'items'");
}
inputs["apiVersion"] = "admissionregistration.k8s.io/v1";
Expand All @@ -75,12 +76,8 @@ export class MutatingWebhookConfigurationList extends pulumi.CustomResource {
inputs["kind"] = undefined /*out*/;
inputs["metadata"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
super(MutatingWebhookConfigurationList.__pulumiType, name, inputs, opts);
}
Expand Down
11 changes: 4 additions & 7 deletions sdk/nodejs/admissionregistration/v1/validatingWebhookConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ export class ValidatingWebhookConfiguration extends pulumi.CustomResource {
*/
constructor(name: string, args?: ValidatingWebhookConfigurationArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
opts = opts || {};
if (!opts.id) {
inputs["apiVersion"] = "admissionregistration.k8s.io/v1";
inputs["kind"] = "ValidatingWebhookConfiguration";
inputs["metadata"] = args ? args.metadata : undefined;
Expand All @@ -72,15 +73,11 @@ export class ValidatingWebhookConfiguration extends pulumi.CustomResource {
inputs["metadata"] = undefined /*out*/;
inputs["webhooks"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
const aliasOpts = { aliases: [{ type: "kubernetes:admissionregistration.k8s.io/v1beta1:ValidatingWebhookConfiguration" }] };
opts = opts ? pulumi.mergeOptions(opts, aliasOpts) : aliasOpts;
opts = pulumi.mergeOptions(opts, aliasOpts);
super(ValidatingWebhookConfiguration.__pulumiType, name, inputs, opts);
}
}
Expand Down
11 changes: 4 additions & 7 deletions sdk/nodejs/admissionregistration/v1/validatingWebhookConfigurationList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ export class ValidatingWebhookConfigurationList extends pulumi.CustomResource {
*/
constructor(name: string, args?: ValidatingWebhookConfigurationListArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
if ((!args || args.items === undefined) && !(opts && opts.urn)) {
opts = opts || {};
if (!opts.id) {
if ((!args || args.items === undefined) && !opts.urn) {
throw new Error("Missing required property 'items'");
}
inputs["apiVersion"] = "admissionregistration.k8s.io/v1";
Expand All @@ -75,12 +76,8 @@ export class ValidatingWebhookConfigurationList extends pulumi.CustomResource {
inputs["kind"] = undefined /*out*/;
inputs["metadata"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
super(ValidatingWebhookConfigurationList.__pulumiType, name, inputs, opts);
}
Expand Down
11 changes: 4 additions & 7 deletions sdk/nodejs/admissionregistration/v1beta1/mutatingWebhookConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ export class MutatingWebhookConfiguration extends pulumi.CustomResource {
*/
constructor(name: string, args?: MutatingWebhookConfigurationArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
opts = opts || {};
if (!opts.id) {
inputs["apiVersion"] = "admissionregistration.k8s.io/v1beta1";
inputs["kind"] = "MutatingWebhookConfiguration";
inputs["metadata"] = args ? args.metadata : undefined;
Expand All @@ -72,15 +73,11 @@ export class MutatingWebhookConfiguration extends pulumi.CustomResource {
inputs["metadata"] = undefined /*out*/;
inputs["webhooks"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
const aliasOpts = { aliases: [{ type: "kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfiguration" }] };
opts = opts ? pulumi.mergeOptions(opts, aliasOpts) : aliasOpts;
opts = pulumi.mergeOptions(opts, aliasOpts);
super(MutatingWebhookConfiguration.__pulumiType, name, inputs, opts);
}
}
Expand Down
11 changes: 4 additions & 7 deletions sdk/nodejs/admissionregistration/v1beta1/mutatingWebhookConfigurationList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ export class MutatingWebhookConfigurationList extends pulumi.CustomResource {
*/
constructor(name: string, args?: MutatingWebhookConfigurationListArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
if ((!args || args.items === undefined) && !(opts && opts.urn)) {
opts = opts || {};
if (!opts.id) {
if ((!args || args.items === undefined) && !opts.urn) {
throw new Error("Missing required property 'items'");
}
inputs["apiVersion"] = "admissionregistration.k8s.io/v1beta1";
Expand All @@ -75,12 +76,8 @@ export class MutatingWebhookConfigurationList extends pulumi.CustomResource {
inputs["kind"] = undefined /*out*/;
inputs["metadata"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
super(MutatingWebhookConfigurationList.__pulumiType, name, inputs, opts);
}
Expand Down
11 changes: 4 additions & 7 deletions sdk/nodejs/admissionregistration/v1beta1/validatingWebhookConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ export class ValidatingWebhookConfiguration extends pulumi.CustomResource {
*/
constructor(name: string, args?: ValidatingWebhookConfigurationArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
opts = opts || {};
if (!opts.id) {
inputs["apiVersion"] = "admissionregistration.k8s.io/v1beta1";
inputs["kind"] = "ValidatingWebhookConfiguration";
inputs["metadata"] = args ? args.metadata : undefined;
Expand All @@ -72,15 +73,11 @@ export class ValidatingWebhookConfiguration extends pulumi.CustomResource {
inputs["metadata"] = undefined /*out*/;
inputs["webhooks"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
const aliasOpts = { aliases: [{ type: "kubernetes:admissionregistration.k8s.io/v1:ValidatingWebhookConfiguration" }] };
opts = opts ? pulumi.mergeOptions(opts, aliasOpts) : aliasOpts;
opts = pulumi.mergeOptions(opts, aliasOpts);
super(ValidatingWebhookConfiguration.__pulumiType, name, inputs, opts);
}
}
Expand Down
11 changes: 4 additions & 7 deletions sdk/nodejs/admissionregistration/v1beta1/validatingWebhookConfigurationList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ export class ValidatingWebhookConfigurationList extends pulumi.CustomResource {
*/
constructor(name: string, args?: ValidatingWebhookConfigurationListArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
if ((!args || args.items === undefined) && !(opts && opts.urn)) {
opts = opts || {};
if (!opts.id) {
if ((!args || args.items === undefined) && !opts.urn) {
throw new Error("Missing required property 'items'");
}
inputs["apiVersion"] = "admissionregistration.k8s.io/v1beta1";
Expand All @@ -75,12 +76,8 @@ export class ValidatingWebhookConfigurationList extends pulumi.CustomResource {
inputs["kind"] = undefined /*out*/;
inputs["metadata"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
super(ValidatingWebhookConfigurationList.__pulumiType, name, inputs, opts);
}
Expand Down
13 changes: 5 additions & 8 deletions sdk/nodejs/apiextensions/v1/customResourceDefinition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ export class CustomResourceDefinition extends pulumi.CustomResource {
*/
constructor(name: string, args?: CustomResourceDefinitionArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
if ((!args || args.spec === undefined) && !(opts && opts.urn)) {
opts = opts || {};
if (!opts.id) {
if ((!args || args.spec === undefined) && !opts.urn) {
throw new Error("Missing required property 'spec'");
}
inputs["apiVersion"] = "apiextensions.k8s.io/v1";
Expand All @@ -78,15 +79,11 @@ export class CustomResourceDefinition extends pulumi.CustomResource {
inputs["spec"] = undefined /*out*/;
inputs["status"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
const aliasOpts = { aliases: [{ type: "kubernetes:apiextensions.k8s.io/v1beta1:CustomResourceDefinition" }] };
opts = opts ? pulumi.mergeOptions(opts, aliasOpts) : aliasOpts;
opts = pulumi.mergeOptions(opts, aliasOpts);
super(CustomResourceDefinition.__pulumiType, name, inputs, opts);
}
}
Expand Down
11 changes: 4 additions & 7 deletions sdk/nodejs/apiextensions/v1/customResourceDefinitionList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ export class CustomResourceDefinitionList extends pulumi.CustomResource {
*/
constructor(name: string, args?: CustomResourceDefinitionListArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
if ((!args || args.items === undefined) && !(opts && opts.urn)) {
opts = opts || {};
if (!opts.id) {
if ((!args || args.items === undefined) && !opts.urn) {
throw new Error("Missing required property 'items'");
}
inputs["apiVersion"] = "apiextensions.k8s.io/v1";
Expand All @@ -72,12 +73,8 @@ export class CustomResourceDefinitionList extends pulumi.CustomResource {
inputs["kind"] = undefined /*out*/;
inputs["metadata"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
super(CustomResourceDefinitionList.__pulumiType, name, inputs, opts);
}
Expand Down
13 changes: 5 additions & 8 deletions sdk/nodejs/apiextensions/v1beta1/customResourceDefinition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ export class CustomResourceDefinition extends pulumi.CustomResource {
*/
constructor(name: string, args?: CustomResourceDefinitionArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
if ((!args || args.spec === undefined) && !(opts && opts.urn)) {
opts = opts || {};
if (!opts.id) {
if ((!args || args.spec === undefined) && !opts.urn) {
throw new Error("Missing required property 'spec'");
}
inputs["apiVersion"] = "apiextensions.k8s.io/v1beta1";
Expand All @@ -78,15 +79,11 @@ export class CustomResourceDefinition extends pulumi.CustomResource {
inputs["spec"] = undefined /*out*/;
inputs["status"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
const aliasOpts = { aliases: [{ type: "kubernetes:apiextensions.k8s.io/v1:CustomResourceDefinition" }] };
opts = opts ? pulumi.mergeOptions(opts, aliasOpts) : aliasOpts;
opts = pulumi.mergeOptions(opts, aliasOpts);
super(CustomResourceDefinition.__pulumiType, name, inputs, opts);
}
}
Expand Down
11 changes: 4 additions & 7 deletions sdk/nodejs/apiextensions/v1beta1/customResourceDefinitionList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ export class CustomResourceDefinitionList extends pulumi.CustomResource {
*/
constructor(name: string, args?: CustomResourceDefinitionListArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
if ((!args || args.items === undefined) && !(opts && opts.urn)) {
opts = opts || {};
if (!opts.id) {
if ((!args || args.items === undefined) && !opts.urn) {
throw new Error("Missing required property 'items'");
}
inputs["apiVersion"] = "apiextensions.k8s.io/v1beta1";
Expand All @@ -72,12 +73,8 @@ export class CustomResourceDefinitionList extends pulumi.CustomResource {
inputs["kind"] = undefined /*out*/;
inputs["metadata"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
super(CustomResourceDefinitionList.__pulumiType, name, inputs, opts);
}
Expand Down
11 changes: 4 additions & 7 deletions sdk/nodejs/apiregistration/v1/apiservice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ export class APIService extends pulumi.CustomResource {
*/
constructor(name: string, args?: APIServiceArgs, opts?: pulumi.CustomResourceOptions) {
let inputs: pulumi.Inputs = {};
if (!(opts && opts.id)) {
opts = opts || {};
if (!opts.id) {
inputs["apiVersion"] = "apiregistration.k8s.io/v1";
inputs["kind"] = "APIService";
inputs["metadata"] = args ? args.metadata : undefined;
Expand All @@ -75,15 +76,11 @@ export class APIService extends pulumi.CustomResource {
inputs["spec"] = undefined /*out*/;
inputs["status"] = undefined /*out*/;
}
if (!opts) {
opts = {}
}

if (!opts.version) {
opts.version = utilities.getVersion();
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});
}
const aliasOpts = { aliases: [{ type: "kubernetes:apiregistration.k8s.io/v1beta1:APIService" }, { type: "kubernetes:apiregistration/v1beta1:APIService" }, { type: "kubernetes:apiregistration/v1:APIService" }] };
opts = opts ? pulumi.mergeOptions(opts, aliasOpts) : aliasOpts;
opts = pulumi.mergeOptions(opts, aliasOpts);
super(APIService.__pulumiType, name, inputs, opts);
}
}
Expand Down
Loading