From 17c9d1ec2c8afc9090290cc1aaa0ef1ee6ba7bd1 Mon Sep 17 00:00:00 2001 From: Levi Blackstone Date: Mon, 16 Dec 2019 17:05:35 -0700 Subject: [PATCH 1/4] Update aliases and deprecation warnings * Add aliases for `NetworkPolicy`, `PodSecurityPolicy`, and `PriorityClass`. * Update "removed in" warning for `rbac/v1alpha1` and `rbac/v1beta1` --- CHANGELOG.md | 2 +- pkg/gen/typegen.go | 16 ++++++++++++++++ pkg/kinds/deprecated.go | 6 ++++++ pkg/kinds/deprecated_test.go | 16 ++++++++++++++++ sdk/nodejs/extensions/v1beta1/NetworkPolicy.ts | 9 ++++++++- .../extensions/v1beta1/PodSecurityPolicy.ts | 9 ++++++++- sdk/nodejs/networking/v1/NetworkPolicy.ts | 9 ++++++++- sdk/nodejs/policy/v1beta1/PodSecurityPolicy.ts | 9 ++++++++- sdk/nodejs/scheduling/v1/PriorityClass.ts | 10 +++++++++- sdk/nodejs/scheduling/v1alpha1/PriorityClass.ts | 10 +++++++++- sdk/nodejs/scheduling/v1beta1/PriorityClass.ts | 10 +++++++++- .../extensions/v1beta1/NetworkPolicy.py | 6 ++++++ .../extensions/v1beta1/PodSecurityPolicy.py | 6 ++++++ .../networking/v1/NetworkPolicy.py | 6 ++++++ .../policy/v1beta1/PodSecurityPolicy.py | 6 ++++++ .../scheduling/v1/PriorityClass.py | 7 +++++++ .../scheduling/v1alpha1/PriorityClass.py | 7 +++++++ .../scheduling/v1beta1/PriorityClass.py | 7 +++++++ 18 files changed, 143 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 981c0d3f76..0c8ac1596e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ### Bug fixes -- Fix deprecation warnings and docs. (https://github.com/pulumi/pulumi-kubernetes/pull/918). +- Fix deprecation warnings and docs. (https://github.com/pulumi/pulumi-kubernetes/pull/918 and https://github.com /pulumi/pulumi-kubernetes/pull/921). ## 1.4.0 (December 9, 2019) diff --git a/pkg/gen/typegen.go b/pkg/gen/typegen.go index 9814670959..655605c1ec 100644 --- a/pkg/gen/typegen.go +++ b/pkg/gen/typegen.go @@ -1225,6 +1225,22 @@ func aliasesForGVK(gvk schema.GroupVersionKind) []string { "kubernetes:networking/v1beta1:Ingress", "kubernetes:extensions/v1beta1:Ingress", } + case kinds.NetworkPolicy: + return []string{ + "kubernetes:networking/v1:NetworkPolicy", + "kubernetes:extensions/v1beta1:NetworkPolicy", + } + case kinds.PodSecurityPolicy: + return []string{ + "kubernetes:policy/v1beta1:PodSecurityPolicy", + "kubernetes:extensions/v1beta1:PodSecurityPolicy", + } + case kinds.PriorityClass: + return []string{ + "kubernetes:scheduling/v1:PriorityClass", + "kubernetes:scheduling/v1beta1:PriorityClass", + "kubernetes:scheduling/v1alpha1:PriorityClass", + } case kinds.ReplicaSet: return []string{ "kubernetes:apps/v1:ReplicaSet", diff --git a/pkg/kinds/deprecated.go b/pkg/kinds/deprecated.go index 2765a126f0..98ab058d0d 100644 --- a/pkg/kinds/deprecated.go +++ b/pkg/kinds/deprecated.go @@ -45,6 +45,9 @@ func RemovedInVersion(gvk schema.GroupVersionKind) *cluster.ServerVersion { } else { removedIn = cluster.ServerVersion{Major: 1, Minor: 16} } + case schema.GroupVersion{Group: "rbac", Version: "v1beta1"}, + schema.GroupVersion{Group: "rbac", Version: "v1alpha1"}: + removedIn = cluster.ServerVersion{Major: 1, Minor: 20} default: return nil } @@ -81,6 +84,9 @@ func SuggestedApiVersion(gvk schema.GroupVersionKind) string { default: return gvkStr(gvk) } + case schema.GroupVersion{Group: "rbac", Version: "v1beta1"}, + schema.GroupVersion{Group: "rbac", Version: "v1alpha1"}: + return "rbac/v1/" + gvk.Kind default: return gvkStr(gvk) } diff --git a/pkg/kinds/deprecated_test.go b/pkg/kinds/deprecated_test.go index cf702fd078..d38c518460 100644 --- a/pkg/kinds/deprecated_test.go +++ b/pkg/kinds/deprecated_test.go @@ -36,6 +36,8 @@ func TestDeprecatedApiVersion(t *testing.T) { {GroupVersionKind{Group: "extensions", Version: "v1beta1", Kind: "NetworkPolicy"}, true}, {GroupVersionKind{Group: "extensions", Version: "v1beta1", Kind: "PodSecurityPolicy"}, true}, {GroupVersionKind{Group: "extensions", Version: "v1beta1", Kind: "ReplicaSet"}, true}, + {GroupVersionKind{Group: "rbac", Version: "v1alpha1", Kind: "ClusterRole"}, true}, + {GroupVersionKind{Group: "rbac", Version: "v1beta1", Kind: "ClusterRole"}, true}, } for _, tt := range tests { t.Run(tt.gvk.String(), func(t *testing.T) { @@ -72,6 +74,14 @@ func TestSuggestedApiVersion(t *testing.T) { GroupVersionKind{Group: "extensions", Version: "v1beta1", Kind: "PodSecurityPolicy"}, "policy/v1beta1/PodSecurityPolicy", }, + { + GroupVersionKind{Group: "rbac", Version: "v1alpha1", Kind: "ClusterRole"}, + "rbac/v1/ClusterRole", + }, + { + GroupVersionKind{Group: "rbac", Version: "v1beta1", Kind: "ClusterRole"}, + "rbac/v1/ClusterRole", + }, // Current ApiVersions return the same version string. { GroupVersionKind{Group: "apps", Version: "v1", Kind: "Deployment"}, @@ -102,6 +112,12 @@ func TestRemovedInVersion(t *testing.T) { {"extensions/v1beta1:Ingress", args{ GroupVersionKind{Group: "extensions", Version: "v1beta1", Kind: "Ingress"}, }, &cluster.ServerVersion{Major: 1, Minor: 20}}, + {"rbac/v1beta1:ClusterRole", args{ + GroupVersionKind{Group: "rbac", Version: "v1beta1", Kind: "ClusterRole"}, + }, &cluster.ServerVersion{Major: 1, Minor: 20}}, + {"rbac/v1alpha1:ClusterRole", args{ + GroupVersionKind{Group: "rbac", Version: "v1alpha1", Kind: "ClusterRole"}, + }, &cluster.ServerVersion{Major: 1, Minor: 20}}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/sdk/nodejs/extensions/v1beta1/NetworkPolicy.ts b/sdk/nodejs/extensions/v1beta1/NetworkPolicy.ts index c272f17adb..483d6df309 100755 --- a/sdk/nodejs/extensions/v1beta1/NetworkPolicy.ts +++ b/sdk/nodejs/extensions/v1beta1/NetworkPolicy.ts @@ -95,6 +95,13 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(NetworkPolicy.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:networking/v1:NetworkPolicy", name: name }, + { parent: opts.parent, type: "kubernetes:extensions/v1beta1:NetworkPolicy", name: name }, + ], + }); + + super(NetworkPolicy.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/extensions/v1beta1/PodSecurityPolicy.ts b/sdk/nodejs/extensions/v1beta1/PodSecurityPolicy.ts index 227bd5f7d9..bf0f1d206c 100755 --- a/sdk/nodejs/extensions/v1beta1/PodSecurityPolicy.ts +++ b/sdk/nodejs/extensions/v1beta1/PodSecurityPolicy.ts @@ -95,6 +95,13 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(PodSecurityPolicy.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:policy/v1beta1:PodSecurityPolicy", name: name }, + { parent: opts.parent, type: "kubernetes:extensions/v1beta1:PodSecurityPolicy", name: name }, + ], + }); + + super(PodSecurityPolicy.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/networking/v1/NetworkPolicy.ts b/sdk/nodejs/networking/v1/NetworkPolicy.ts index e874104161..be81e4db1e 100755 --- a/sdk/nodejs/networking/v1/NetworkPolicy.ts +++ b/sdk/nodejs/networking/v1/NetworkPolicy.ts @@ -93,6 +93,13 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(NetworkPolicy.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:networking/v1:NetworkPolicy", name: name }, + { parent: opts.parent, type: "kubernetes:extensions/v1beta1:NetworkPolicy", name: name }, + ], + }); + + super(NetworkPolicy.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/policy/v1beta1/PodSecurityPolicy.ts b/sdk/nodejs/policy/v1beta1/PodSecurityPolicy.ts index b45762f978..707fff4222 100755 --- a/sdk/nodejs/policy/v1beta1/PodSecurityPolicy.ts +++ b/sdk/nodejs/policy/v1beta1/PodSecurityPolicy.ts @@ -94,6 +94,13 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(PodSecurityPolicy.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:policy/v1beta1:PodSecurityPolicy", name: name }, + { parent: opts.parent, type: "kubernetes:extensions/v1beta1:PodSecurityPolicy", name: name }, + ], + }); + + super(PodSecurityPolicy.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/scheduling/v1/PriorityClass.ts b/sdk/nodejs/scheduling/v1/PriorityClass.ts index fed40f22c2..b45c6f1122 100755 --- a/sdk/nodejs/scheduling/v1/PriorityClass.ts +++ b/sdk/nodejs/scheduling/v1/PriorityClass.ts @@ -120,6 +120,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(PriorityClass.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:scheduling/v1:PriorityClass", name: name }, + { parent: opts.parent, type: "kubernetes:scheduling/v1beta1:PriorityClass", name: name }, + { parent: opts.parent, type: "kubernetes:scheduling/v1alpha1:PriorityClass", name: name }, + ], + }); + + super(PriorityClass.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/scheduling/v1alpha1/PriorityClass.ts b/sdk/nodejs/scheduling/v1alpha1/PriorityClass.ts index d263f4fb13..479f4d3861 100755 --- a/sdk/nodejs/scheduling/v1alpha1/PriorityClass.ts +++ b/sdk/nodejs/scheduling/v1alpha1/PriorityClass.ts @@ -121,6 +121,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(PriorityClass.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:scheduling/v1:PriorityClass", name: name }, + { parent: opts.parent, type: "kubernetes:scheduling/v1beta1:PriorityClass", name: name }, + { parent: opts.parent, type: "kubernetes:scheduling/v1alpha1:PriorityClass", name: name }, + ], + }); + + super(PriorityClass.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/scheduling/v1beta1/PriorityClass.ts b/sdk/nodejs/scheduling/v1beta1/PriorityClass.ts index 1fa0496c9c..34ff077b01 100755 --- a/sdk/nodejs/scheduling/v1beta1/PriorityClass.ts +++ b/sdk/nodejs/scheduling/v1beta1/PriorityClass.ts @@ -121,6 +121,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(PriorityClass.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:scheduling/v1:PriorityClass", name: name }, + { parent: opts.parent, type: "kubernetes:scheduling/v1beta1:PriorityClass", name: name }, + { parent: opts.parent, type: "kubernetes:scheduling/v1alpha1:PriorityClass", name: name }, + ], + }); + + super(PriorityClass.__pulumiType, name, props, _opts); } } diff --git a/sdk/python/pulumi_kubernetes/extensions/v1beta1/NetworkPolicy.py b/sdk/python/pulumi_kubernetes/extensions/v1beta1/NetworkPolicy.py index 44c14ead5b..acacc47de6 100755 --- a/sdk/python/pulumi_kubernetes/extensions/v1beta1/NetworkPolicy.py +++ b/sdk/python/pulumi_kubernetes/extensions/v1beta1/NetworkPolicy.py @@ -75,8 +75,14 @@ def __init__(self, resource_name, opts=None, metadata=None, spec=None, __name__= __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:networking/v1:NetworkPolicy", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:extensions/v1beta1:NetworkPolicy", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(NetworkPolicy, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/extensions/v1beta1/PodSecurityPolicy.py b/sdk/python/pulumi_kubernetes/extensions/v1beta1/PodSecurityPolicy.py index a82cb28f63..ee17addc2c 100755 --- a/sdk/python/pulumi_kubernetes/extensions/v1beta1/PodSecurityPolicy.py +++ b/sdk/python/pulumi_kubernetes/extensions/v1beta1/PodSecurityPolicy.py @@ -75,8 +75,14 @@ def __init__(self, resource_name, opts=None, metadata=None, spec=None, __name__= __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:policy/v1beta1:PodSecurityPolicy", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:extensions/v1beta1:PodSecurityPolicy", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(PodSecurityPolicy, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/networking/v1/NetworkPolicy.py b/sdk/python/pulumi_kubernetes/networking/v1/NetworkPolicy.py index b9d48d9d7e..89849d9887 100755 --- a/sdk/python/pulumi_kubernetes/networking/v1/NetworkPolicy.py +++ b/sdk/python/pulumi_kubernetes/networking/v1/NetworkPolicy.py @@ -73,8 +73,14 @@ def __init__(self, resource_name, opts=None, metadata=None, spec=None, __name__= __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:networking/v1:NetworkPolicy", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:extensions/v1beta1:NetworkPolicy", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(NetworkPolicy, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/policy/v1beta1/PodSecurityPolicy.py b/sdk/python/pulumi_kubernetes/policy/v1beta1/PodSecurityPolicy.py index cba57a8284..f3faa22fd8 100755 --- a/sdk/python/pulumi_kubernetes/policy/v1beta1/PodSecurityPolicy.py +++ b/sdk/python/pulumi_kubernetes/policy/v1beta1/PodSecurityPolicy.py @@ -74,8 +74,14 @@ def __init__(self, resource_name, opts=None, metadata=None, spec=None, __name__= __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:policy/v1beta1:PodSecurityPolicy", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:extensions/v1beta1:PodSecurityPolicy", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(PodSecurityPolicy, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/scheduling/v1/PriorityClass.py b/sdk/python/pulumi_kubernetes/scheduling/v1/PriorityClass.py index 47ffc141d9..3dffdc88fb 100755 --- a/sdk/python/pulumi_kubernetes/scheduling/v1/PriorityClass.py +++ b/sdk/python/pulumi_kubernetes/scheduling/v1/PriorityClass.py @@ -114,8 +114,15 @@ def __init__(self, resource_name, opts=None, value=None, description=None, globa __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:scheduling/v1:PriorityClass", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:scheduling/v1beta1:PriorityClass", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:scheduling/v1alpha1:PriorityClass", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(PriorityClass, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/scheduling/v1alpha1/PriorityClass.py b/sdk/python/pulumi_kubernetes/scheduling/v1alpha1/PriorityClass.py index 9bebb8fb73..64bc1860a4 100755 --- a/sdk/python/pulumi_kubernetes/scheduling/v1alpha1/PriorityClass.py +++ b/sdk/python/pulumi_kubernetes/scheduling/v1alpha1/PriorityClass.py @@ -115,8 +115,15 @@ def __init__(self, resource_name, opts=None, value=None, description=None, globa __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:scheduling/v1:PriorityClass", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:scheduling/v1beta1:PriorityClass", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:scheduling/v1alpha1:PriorityClass", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(PriorityClass, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/scheduling/v1beta1/PriorityClass.py b/sdk/python/pulumi_kubernetes/scheduling/v1beta1/PriorityClass.py index f58eb93b9c..5749b2c151 100755 --- a/sdk/python/pulumi_kubernetes/scheduling/v1beta1/PriorityClass.py +++ b/sdk/python/pulumi_kubernetes/scheduling/v1beta1/PriorityClass.py @@ -115,8 +115,15 @@ def __init__(self, resource_name, opts=None, value=None, description=None, globa __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:scheduling/v1:PriorityClass", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:scheduling/v1beta1:PriorityClass", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:scheduling/v1alpha1:PriorityClass", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(PriorityClass, self).__init__( From 9beed5d00b8e730780b6d88bca6d87de6ed27a8a Mon Sep 17 00:00:00 2001 From: Levi Blackstone Date: Mon, 16 Dec 2019 17:22:13 -0700 Subject: [PATCH 2/4] Fix NetworkPolicy case --- pkg/kinds/deprecated.go | 4 +++- pkg/kinds/deprecated_test.go | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/kinds/deprecated.go b/pkg/kinds/deprecated.go index 98ab058d0d..72638b073f 100644 --- a/pkg/kinds/deprecated.go +++ b/pkg/kinds/deprecated.go @@ -75,10 +75,12 @@ func SuggestedApiVersion(gvk schema.GroupVersionKind) string { return "apps/v1/" + gvk.Kind case schema.GroupVersion{Group: "extensions", Version: "v1beta1"}: switch Kind(gvk.Kind) { - case DaemonSet, Deployment, NetworkPolicy, ReplicaSet: + case DaemonSet, Deployment, ReplicaSet: return "apps/v1/" + gvk.Kind case Ingress: return "networking/v1beta1/" + gvk.Kind + case NetworkPolicy: + return "networking/v1/" + gvk.Kind case PodSecurityPolicy: return "policy/v1beta1/" + gvk.Kind default: diff --git a/pkg/kinds/deprecated_test.go b/pkg/kinds/deprecated_test.go index d38c518460..96796073b1 100644 --- a/pkg/kinds/deprecated_test.go +++ b/pkg/kinds/deprecated_test.go @@ -70,6 +70,10 @@ func TestSuggestedApiVersion(t *testing.T) { GroupVersionKind{Group: "extensions", Version: "v1beta1", Kind: "Ingress"}, "networking/v1beta1/Ingress", }, + { + GroupVersionKind{Group: "extensions", Version: "v1beta1", Kind: "NetworkPolicy"}, + "networking/v1/NetworkPolicy", + }, { GroupVersionKind{Group: "extensions", Version: "v1beta1", Kind: "PodSecurityPolicy"}, "policy/v1beta1/PodSecurityPolicy", From aa82a009f110bbb7b91f699e273a8d66fa9f8d04 Mon Sep 17 00:00:00 2001 From: Levi Blackstone Date: Tue, 17 Dec 2019 09:39:50 -0700 Subject: [PATCH 3/4] Add reference links and hande scheduling API --- pkg/kinds/deprecated.go | 38 ++++++++++++++++++++++++++++++++++++ pkg/kinds/deprecated_test.go | 14 +++++++++++++ 2 files changed, 52 insertions(+) diff --git a/pkg/kinds/deprecated.go b/pkg/kinds/deprecated.go index 72638b073f..353787aafb 100644 --- a/pkg/kinds/deprecated.go +++ b/pkg/kinds/deprecated.go @@ -21,6 +21,36 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" ) +// +// Reference links: +// +// GVK / Deprecated Version / Removed Version +// Upstream Docs Link +// ----------------------------------------------------------- +// extensions/v1beta1/DaemonSet / 1.14 / 1.16 +// apps/v1beta1/DaemonSet / 1.14 / 1.16 +// apps/v1beta2/DaemonSet / 1.14 / 1.16 +// extensions/v1beta1/Deployment / 1.14 / 1.16 +// apps/v1beta1/Deployment / 1.14 / 1.16 +// apps/v1beta2/Deployment / 1.14 / 1.16 +// extensions/v1beta1/NetworkPolicy / 1.14 / 1.16 +// extensions/v1beta1/PodSecurityPolicy / 1.14 / 1.16 +// extensions/v1beta1/ReplicaSet / 1.14 / 1.16 +// apps/v1beta1/ReplicaSet / 1.14 / 1.16 +// apps/v1beta2/ReplicaSet / 1.14 / 1.16 +// https://git.k8s.io/kubernetes/CHANGELOG-1.14.md#deprecations +// +// scheduling/v1alpha1/PriorityClass / 1.14 / 1.17 +// scheduling/v1beta1/PriorityClass / 1.14 / 1.17 +// https://git.k8s.io/kubernetes/CHANGELOG-1.14.md#deprecations +// +// extensions/v1beta1/Ingress / 1.14 / 1.18 +// https://git.k8s.io/kubernetes/CHANGELOG-1.14.md#deprecations +// +// rbac/v1alpha1/* / 1.17 / 1.20 +// rbac/v1beta1/* / 1.17 / 1.20 +// https://git.k8s.io/kubernetes/CHANGELOG-1.17.md#deprecations-and-removals + func gvkStr(gvk schema.GroupVersionKind) string { return gvk.GroupVersion().String() + "/" + gvk.Kind } @@ -48,6 +78,9 @@ func RemovedInVersion(gvk schema.GroupVersionKind) *cluster.ServerVersion { case schema.GroupVersion{Group: "rbac", Version: "v1beta1"}, schema.GroupVersion{Group: "rbac", Version: "v1alpha1"}: removedIn = cluster.ServerVersion{Major: 1, Minor: 20} + case schema.GroupVersion{Group: "scheduling", Version: "v1beta1"}, + schema.GroupVersion{Group: "scheduling", Version: "v1alpha1"}: + removedIn = cluster.ServerVersion{Major: 1, Minor: 17} default: return nil } @@ -89,6 +122,9 @@ func SuggestedApiVersion(gvk schema.GroupVersionKind) string { case schema.GroupVersion{Group: "rbac", Version: "v1beta1"}, schema.GroupVersion{Group: "rbac", Version: "v1alpha1"}: return "rbac/v1/" + gvk.Kind + case schema.GroupVersion{Group: "scheduling", Version: "v1beta1"}, + schema.GroupVersion{Group: "scheduling", Version: "v1alpha1"}: + return "scheduling/v1/" + gvk.Kind default: return gvkStr(gvk) } @@ -99,6 +135,8 @@ func upstreamDocsLink(version cluster.ServerVersion) string { switch version { case cluster.ServerVersion{Major: 1, Minor: 16}: return "https://git.k8s.io/kubernetes/CHANGELOG-1.16.md#deprecations-and-removals" + case cluster.ServerVersion{Major: 1, Minor: 17}: + return "https://git.k8s.io/kubernetes/CHANGELOG-1.17.md#deprecations-and-removals" default: return "" } diff --git a/pkg/kinds/deprecated_test.go b/pkg/kinds/deprecated_test.go index 96796073b1..f810bd08ce 100644 --- a/pkg/kinds/deprecated_test.go +++ b/pkg/kinds/deprecated_test.go @@ -86,6 +86,14 @@ func TestSuggestedApiVersion(t *testing.T) { GroupVersionKind{Group: "rbac", Version: "v1beta1", Kind: "ClusterRole"}, "rbac/v1/ClusterRole", }, + { + GroupVersionKind{Group: "scheduling", Version: "v1beta1", Kind: "PriorityClass"}, + "scheduling/v1/PriorityClass", + }, + { + GroupVersionKind{Group: "scheduling", Version: "v1alpha1", Kind: "PriorityClass"}, + "scheduling/v1/PriorityClass", + }, // Current ApiVersions return the same version string. { GroupVersionKind{Group: "apps", Version: "v1", Kind: "Deployment"}, @@ -122,6 +130,12 @@ func TestRemovedInVersion(t *testing.T) { {"rbac/v1alpha1:ClusterRole", args{ GroupVersionKind{Group: "rbac", Version: "v1alpha1", Kind: "ClusterRole"}, }, &cluster.ServerVersion{Major: 1, Minor: 20}}, + {"scheduling/v1beta1:PriorityClass", args{ + GroupVersionKind{Group: "scheduling", Version: "v1beta1", Kind: "PriorityClass"}, + }, &cluster.ServerVersion{Major: 1, Minor: 17}}, + {"scheduling/v1alpha1:PriorityClass", args{ + GroupVersionKind{Group: "scheduling", Version: "v1alpha1", Kind: "PriorityClass"}, + }, &cluster.ServerVersion{Major: 1, Minor: 17}}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { From be63213d77f53b1e96b5ddd1613bafa70b1fa9ad Mon Sep 17 00:00:00 2001 From: Levi Blackstone Date: Tue, 17 Dec 2019 10:22:36 -0700 Subject: [PATCH 4/4] Add a few more missing aliases --- pkg/gen/typegen.go | 55 ++++++++----------- sdk/nodejs/rbac/v1/ClusterRole.ts | 10 +++- sdk/nodejs/rbac/v1/ClusterRoleBinding.ts | 10 +++- sdk/nodejs/rbac/v1/Role.ts | 10 +++- sdk/nodejs/rbac/v1/RoleBinding.ts | 10 +++- sdk/nodejs/rbac/v1alpha1/ClusterRole.ts | 10 +++- .../rbac/v1alpha1/ClusterRoleBinding.ts | 10 +++- sdk/nodejs/rbac/v1alpha1/Role.ts | 10 +++- sdk/nodejs/rbac/v1alpha1/RoleBinding.ts | 10 +++- sdk/nodejs/rbac/v1beta1/ClusterRole.ts | 10 +++- sdk/nodejs/rbac/v1beta1/ClusterRoleBinding.ts | 10 +++- sdk/nodejs/rbac/v1beta1/Role.ts | 10 +++- sdk/nodejs/rbac/v1beta1/RoleBinding.ts | 10 +++- .../pulumi_kubernetes/rbac/v1/ClusterRole.py | 7 +++ .../rbac/v1/ClusterRoleBinding.py | 7 +++ sdk/python/pulumi_kubernetes/rbac/v1/Role.py | 7 +++ .../pulumi_kubernetes/rbac/v1/RoleBinding.py | 7 +++ .../rbac/v1alpha1/ClusterRole.py | 7 +++ .../rbac/v1alpha1/ClusterRoleBinding.py | 7 +++ .../pulumi_kubernetes/rbac/v1alpha1/Role.py | 7 +++ .../rbac/v1alpha1/RoleBinding.py | 7 +++ .../rbac/v1beta1/ClusterRole.py | 7 +++ .../rbac/v1beta1/ClusterRoleBinding.py | 7 +++ .../pulumi_kubernetes/rbac/v1beta1/Role.py | 7 +++ .../rbac/v1beta1/RoleBinding.py | 7 +++ 25 files changed, 216 insertions(+), 43 deletions(-) diff --git a/pkg/gen/typegen.go b/pkg/gen/typegen.go index 655605c1ec..8c332f5b9b 100644 --- a/pkg/gen/typegen.go +++ b/pkg/gen/typegen.go @@ -1207,52 +1207,45 @@ func aliasesForGVK(gvk schema.GroupVersionKind) []string { kind := kinds.Kind(gvk.Kind) switch kind { - case kinds.DaemonSet: + case kinds.ClusterRole, kinds.ClusterRoleBinding, kinds.Role, kinds.RoleBinding: return []string{ - "kubernetes:apps/v1:DaemonSet", - "kubernetes:apps/v1beta2:DaemonSet", - "kubernetes:extensions/v1beta1:DaemonSet", + fmt.Sprintf("kubernetes:rbac/v1:%s", gvk.Kind), + fmt.Sprintf("kubernetes:rbac/v1beta1:%s", gvk.Kind), + fmt.Sprintf("kubernetes:rbac/v1alpha1:%s", gvk.Kind), } - case kinds.Deployment: + case kinds.DaemonSet, kinds.ReplicaSet: return []string{ - "kubernetes:apps/v1:Deployment", - "kubernetes:apps/v1beta1:Deployment", - "kubernetes:apps/v1beta2:Deployment", - "kubernetes:extensions/v1beta1:Deployment", + fmt.Sprintf("kubernetes:apps/v1:%s", gvk.Kind), + fmt.Sprintf("kubernetes:apps/v1beta2:%s", gvk.Kind), + fmt.Sprintf("kubernetes:extensions/v1beta1:%s", gvk.Kind), + } + case kinds.Deployment, kinds.StatefulSet: + return []string{ + fmt.Sprintf("kubernetes:apps/v1:%s", gvk.Kind), + fmt.Sprintf("kubernetes:apps/v1beta1:%s", gvk.Kind), + fmt.Sprintf("kubernetes:apps/v1beta2:%s", gvk.Kind), + fmt.Sprintf("kubernetes:extensions/v1beta1:%s", gvk.Kind), } case kinds.Ingress: return []string{ - "kubernetes:networking/v1beta1:Ingress", - "kubernetes:extensions/v1beta1:Ingress", + fmt.Sprintf("kubernetes:networking/v1beta1:%s", gvk.Kind), + fmt.Sprintf("kubernetes:extensions/v1beta1:%s", gvk.Kind), } case kinds.NetworkPolicy: return []string{ - "kubernetes:networking/v1:NetworkPolicy", - "kubernetes:extensions/v1beta1:NetworkPolicy", + fmt.Sprintf("kubernetes:networking/v1:%s", gvk.Kind), + fmt.Sprintf("kubernetes:extensions/v1beta1:%s", gvk.Kind), } case kinds.PodSecurityPolicy: return []string{ - "kubernetes:policy/v1beta1:PodSecurityPolicy", - "kubernetes:extensions/v1beta1:PodSecurityPolicy", + fmt.Sprintf("kubernetes:policy/v1beta1:%s", gvk.Kind), + fmt.Sprintf("kubernetes:extensions/v1beta1:%s", gvk.Kind), } case kinds.PriorityClass: return []string{ - "kubernetes:scheduling/v1:PriorityClass", - "kubernetes:scheduling/v1beta1:PriorityClass", - "kubernetes:scheduling/v1alpha1:PriorityClass", - } - case kinds.ReplicaSet: - return []string{ - "kubernetes:apps/v1:ReplicaSet", - "kubernetes:apps/v1beta2:ReplicaSet", - "kubernetes:extensions/v1beta1:ReplicaSet", - } - case kinds.StatefulSet: - return []string{ - "kubernetes:apps/v1:StatefulSet", - "kubernetes:apps/v1beta1:StatefulSet", - "kubernetes:apps/v1beta2:StatefulSet", - "kubernetes:extensions/v1beta1:StatefulSet", + fmt.Sprintf("kubernetes:scheduling/v1:%s", gvk.Kind), + fmt.Sprintf("kubernetes:scheduling/v1beta1:%s", gvk.Kind), + fmt.Sprintf("kubernetes:scheduling/v1alpha1:%s", gvk.Kind), } default: return []string{} diff --git a/sdk/nodejs/rbac/v1/ClusterRole.ts b/sdk/nodejs/rbac/v1/ClusterRole.ts index 58ab546fd1..ea2a1e07b5 100755 --- a/sdk/nodejs/rbac/v1/ClusterRole.ts +++ b/sdk/nodejs/rbac/v1/ClusterRole.ts @@ -101,6 +101,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(ClusterRole.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:ClusterRole", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:ClusterRole", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:ClusterRole", name: name }, + ], + }); + + super(ClusterRole.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/rbac/v1/ClusterRoleBinding.ts b/sdk/nodejs/rbac/v1/ClusterRoleBinding.ts index 8c59dd43de..7bdb166484 100755 --- a/sdk/nodejs/rbac/v1/ClusterRoleBinding.ts +++ b/sdk/nodejs/rbac/v1/ClusterRoleBinding.ts @@ -100,6 +100,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(ClusterRoleBinding.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:ClusterRoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:ClusterRoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:ClusterRoleBinding", name: name }, + ], + }); + + super(ClusterRoleBinding.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/rbac/v1/Role.ts b/sdk/nodejs/rbac/v1/Role.ts index 2b248557a1..9d9486fbfa 100755 --- a/sdk/nodejs/rbac/v1/Role.ts +++ b/sdk/nodejs/rbac/v1/Role.ts @@ -93,6 +93,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(Role.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:Role", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:Role", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:Role", name: name }, + ], + }); + + super(Role.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/rbac/v1/RoleBinding.ts b/sdk/nodejs/rbac/v1/RoleBinding.ts index c2b18022c9..3b180e652c 100755 --- a/sdk/nodejs/rbac/v1/RoleBinding.ts +++ b/sdk/nodejs/rbac/v1/RoleBinding.ts @@ -102,6 +102,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(RoleBinding.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:RoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:RoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:RoleBinding", name: name }, + ], + }); + + super(RoleBinding.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/rbac/v1alpha1/ClusterRole.ts b/sdk/nodejs/rbac/v1alpha1/ClusterRole.ts index 0c442b9766..7230da33b0 100755 --- a/sdk/nodejs/rbac/v1alpha1/ClusterRole.ts +++ b/sdk/nodejs/rbac/v1alpha1/ClusterRole.ts @@ -102,6 +102,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(ClusterRole.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:ClusterRole", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:ClusterRole", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:ClusterRole", name: name }, + ], + }); + + super(ClusterRole.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/rbac/v1alpha1/ClusterRoleBinding.ts b/sdk/nodejs/rbac/v1alpha1/ClusterRoleBinding.ts index 34b3b97aa1..6838dedccd 100755 --- a/sdk/nodejs/rbac/v1alpha1/ClusterRoleBinding.ts +++ b/sdk/nodejs/rbac/v1alpha1/ClusterRoleBinding.ts @@ -102,6 +102,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(ClusterRoleBinding.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:ClusterRoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:ClusterRoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:ClusterRoleBinding", name: name }, + ], + }); + + super(ClusterRoleBinding.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/rbac/v1alpha1/Role.ts b/sdk/nodejs/rbac/v1alpha1/Role.ts index 166f0320a6..222fa4803e 100755 --- a/sdk/nodejs/rbac/v1alpha1/Role.ts +++ b/sdk/nodejs/rbac/v1alpha1/Role.ts @@ -94,6 +94,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(Role.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:Role", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:Role", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:Role", name: name }, + ], + }); + + super(Role.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/rbac/v1alpha1/RoleBinding.ts b/sdk/nodejs/rbac/v1alpha1/RoleBinding.ts index 7ad2a1c16a..862599caea 100755 --- a/sdk/nodejs/rbac/v1alpha1/RoleBinding.ts +++ b/sdk/nodejs/rbac/v1alpha1/RoleBinding.ts @@ -103,6 +103,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(RoleBinding.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:RoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:RoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:RoleBinding", name: name }, + ], + }); + + super(RoleBinding.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/rbac/v1beta1/ClusterRole.ts b/sdk/nodejs/rbac/v1beta1/ClusterRole.ts index a00c849c55..6fded1efc1 100755 --- a/sdk/nodejs/rbac/v1beta1/ClusterRole.ts +++ b/sdk/nodejs/rbac/v1beta1/ClusterRole.ts @@ -102,6 +102,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(ClusterRole.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:ClusterRole", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:ClusterRole", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:ClusterRole", name: name }, + ], + }); + + super(ClusterRole.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/rbac/v1beta1/ClusterRoleBinding.ts b/sdk/nodejs/rbac/v1beta1/ClusterRoleBinding.ts index ca8b106a54..0e107a2c1b 100755 --- a/sdk/nodejs/rbac/v1beta1/ClusterRoleBinding.ts +++ b/sdk/nodejs/rbac/v1beta1/ClusterRoleBinding.ts @@ -102,6 +102,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(ClusterRoleBinding.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:ClusterRoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:ClusterRoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:ClusterRoleBinding", name: name }, + ], + }); + + super(ClusterRoleBinding.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/rbac/v1beta1/Role.ts b/sdk/nodejs/rbac/v1beta1/Role.ts index 6d7919f2dd..c77a55af27 100755 --- a/sdk/nodejs/rbac/v1beta1/Role.ts +++ b/sdk/nodejs/rbac/v1beta1/Role.ts @@ -94,6 +94,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(Role.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:Role", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:Role", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:Role", name: name }, + ], + }); + + super(Role.__pulumiType, name, props, _opts); } } diff --git a/sdk/nodejs/rbac/v1beta1/RoleBinding.ts b/sdk/nodejs/rbac/v1beta1/RoleBinding.ts index d1fa052fcc..6b41f11669 100755 --- a/sdk/nodejs/rbac/v1beta1/RoleBinding.ts +++ b/sdk/nodejs/rbac/v1beta1/RoleBinding.ts @@ -103,6 +103,14 @@ import { getVersion } from "../../version"; opts.version = getVersion(); } - super(RoleBinding.__pulumiType, name, props, opts); + const _opts = pulumi.mergeOptions(opts, { + aliases: [ + { parent: opts.parent, type: "kubernetes:rbac/v1:RoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1beta1:RoleBinding", name: name }, + { parent: opts.parent, type: "kubernetes:rbac/v1alpha1:RoleBinding", name: name }, + ], + }); + + super(RoleBinding.__pulumiType, name, props, _opts); } } diff --git a/sdk/python/pulumi_kubernetes/rbac/v1/ClusterRole.py b/sdk/python/pulumi_kubernetes/rbac/v1/ClusterRole.py index e0a2f8e702..e150aa0d85 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1/ClusterRole.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1/ClusterRole.py @@ -83,8 +83,15 @@ def __init__(self, resource_name, opts=None, aggregation_rule=None, metadata=Non __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:ClusterRole", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:ClusterRole", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:ClusterRole", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(ClusterRole, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/rbac/v1/ClusterRoleBinding.py b/sdk/python/pulumi_kubernetes/rbac/v1/ClusterRoleBinding.py index aa926a6c45..511e36b382 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1/ClusterRoleBinding.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1/ClusterRoleBinding.py @@ -83,8 +83,15 @@ def __init__(self, resource_name, opts=None, role_ref=None, metadata=None, subje __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:ClusterRoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:ClusterRoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:ClusterRoleBinding", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(ClusterRoleBinding, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/rbac/v1/Role.py b/sdk/python/pulumi_kubernetes/rbac/v1/Role.py index 620b0f9f3e..810348bf02 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1/Role.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1/Role.py @@ -72,8 +72,15 @@ def __init__(self, resource_name, opts=None, metadata=None, rules=None, __name__ __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:Role", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:Role", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:Role", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(Role, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/rbac/v1/RoleBinding.py b/sdk/python/pulumi_kubernetes/rbac/v1/RoleBinding.py index f0e37b0a9e..1f92de315b 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1/RoleBinding.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1/RoleBinding.py @@ -85,8 +85,15 @@ def __init__(self, resource_name, opts=None, role_ref=None, metadata=None, subje __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:RoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:RoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:RoleBinding", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(RoleBinding, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/rbac/v1alpha1/ClusterRole.py b/sdk/python/pulumi_kubernetes/rbac/v1alpha1/ClusterRole.py index 15b1193d73..200341bfaf 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1alpha1/ClusterRole.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1alpha1/ClusterRole.py @@ -84,8 +84,15 @@ def __init__(self, resource_name, opts=None, aggregation_rule=None, metadata=Non __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:ClusterRole", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:ClusterRole", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:ClusterRole", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(ClusterRole, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/rbac/v1alpha1/ClusterRoleBinding.py b/sdk/python/pulumi_kubernetes/rbac/v1alpha1/ClusterRoleBinding.py index 4a0a11fff9..5c12d4f2e1 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1alpha1/ClusterRoleBinding.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1alpha1/ClusterRoleBinding.py @@ -84,8 +84,15 @@ def __init__(self, resource_name, opts=None, role_ref=None, metadata=None, subje __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:ClusterRoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:ClusterRoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:ClusterRoleBinding", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(ClusterRoleBinding, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/rbac/v1alpha1/Role.py b/sdk/python/pulumi_kubernetes/rbac/v1alpha1/Role.py index f938e26d57..7a2d69c19f 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1alpha1/Role.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1alpha1/Role.py @@ -73,8 +73,15 @@ def __init__(self, resource_name, opts=None, metadata=None, rules=None, __name__ __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:Role", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:Role", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:Role", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(Role, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/rbac/v1alpha1/RoleBinding.py b/sdk/python/pulumi_kubernetes/rbac/v1alpha1/RoleBinding.py index f35dbf3c6a..cb3c4a5571 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1alpha1/RoleBinding.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1alpha1/RoleBinding.py @@ -86,8 +86,15 @@ def __init__(self, resource_name, opts=None, role_ref=None, metadata=None, subje __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:RoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:RoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:RoleBinding", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(RoleBinding, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/rbac/v1beta1/ClusterRole.py b/sdk/python/pulumi_kubernetes/rbac/v1beta1/ClusterRole.py index 005706ee0d..2e2dca0d11 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1beta1/ClusterRole.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1beta1/ClusterRole.py @@ -84,8 +84,15 @@ def __init__(self, resource_name, opts=None, aggregation_rule=None, metadata=Non __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:ClusterRole", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:ClusterRole", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:ClusterRole", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(ClusterRole, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/rbac/v1beta1/ClusterRoleBinding.py b/sdk/python/pulumi_kubernetes/rbac/v1beta1/ClusterRoleBinding.py index 332fbf0853..2033f0ef86 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1beta1/ClusterRoleBinding.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1beta1/ClusterRoleBinding.py @@ -84,8 +84,15 @@ def __init__(self, resource_name, opts=None, role_ref=None, metadata=None, subje __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:ClusterRoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:ClusterRoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:ClusterRoleBinding", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(ClusterRoleBinding, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/rbac/v1beta1/Role.py b/sdk/python/pulumi_kubernetes/rbac/v1beta1/Role.py index 275ba3bd83..c6ed7b5da2 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1beta1/Role.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1beta1/Role.py @@ -73,8 +73,15 @@ def __init__(self, resource_name, opts=None, metadata=None, rules=None, __name__ __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:Role", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:Role", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:Role", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(Role, self).__init__( diff --git a/sdk/python/pulumi_kubernetes/rbac/v1beta1/RoleBinding.py b/sdk/python/pulumi_kubernetes/rbac/v1beta1/RoleBinding.py index 2249a01dfa..78222659f9 100755 --- a/sdk/python/pulumi_kubernetes/rbac/v1beta1/RoleBinding.py +++ b/sdk/python/pulumi_kubernetes/rbac/v1beta1/RoleBinding.py @@ -86,8 +86,15 @@ def __init__(self, resource_name, opts=None, role_ref=None, metadata=None, subje __props__['status'] = None + parent = opts.parent if opts and opts.parent else None + aliases = [ + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1:RoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1beta1:RoleBinding", name=resource_name), + pulumi.Alias(parent=parent, type_="kubernetes:rbac/v1alpha1:RoleBinding", name=resource_name), + ] opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions( version=version.get_version(), + aliases=aliases, )) super(RoleBinding, self).__init__(