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

Update aliases and deprecation warnings #921

Merged
merged 4 commits into from
Dec 17, 2019
Merged

Update aliases and deprecation warnings #921

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17c9d1e
Update aliases and deprecation warnings
lblackstone Dec 17, 2019
9beed5d
Fix NetworkPolicy case
lblackstone Dec 17, 2019
aa82a00
Add reference links and hande scheduling API
lblackstone Dec 17, 2019
be63213
Add a few more missing aliases
lblackstone Dec 17, 2019
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
16 changes: 16 additions & 0 deletions pkg/gen/typegen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 9 additions & 1 deletion pkg/kinds/deprecated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -72,15 +75,20 @@ 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:
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)
}
Expand Down
20 changes: 20 additions & 0 deletions pkg/kinds/deprecated_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -68,10 +70,22 @@ 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",
},
{
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"},
Expand Down Expand Up @@ -102,6 +116,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) {
Expand Down
9 changes: 8 additions & 1 deletion sdk/nodejs/extensions/v1beta1/NetworkPolicy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
9 changes: 8 additions & 1 deletion sdk/nodejs/extensions/v1beta1/PodSecurityPolicy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
9 changes: 8 additions & 1 deletion sdk/nodejs/networking/v1/NetworkPolicy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
9 changes: 8 additions & 1 deletion sdk/nodejs/policy/v1beta1/PodSecurityPolicy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
10 changes: 9 additions & 1 deletion sdk/nodejs/scheduling/v1/PriorityClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
10 changes: 9 additions & 1 deletion sdk/nodejs/scheduling/v1alpha1/PriorityClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
10 changes: 9 additions & 1 deletion sdk/nodejs/scheduling/v1beta1/PriorityClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
6 changes: 6 additions & 0 deletions sdk/python/pulumi_kubernetes/extensions/v1beta1/NetworkPolicy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__(
Expand Down
6 changes: 6 additions & 0 deletions sdk/python/pulumi_kubernetes/extensions/v1beta1/PodSecurityPolicy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__(
Expand Down
6 changes: 6 additions & 0 deletions sdk/python/pulumi_kubernetes/networking/v1/NetworkPolicy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__(
Expand Down
6 changes: 6 additions & 0 deletions sdk/python/pulumi_kubernetes/policy/v1beta1/PodSecurityPolicy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__(
Expand Down
7 changes: 7 additions & 0 deletions sdk/python/pulumi_kubernetes/scheduling/v1/PriorityClass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__(
Expand Down
7 changes: 7 additions & 0 deletions sdk/python/pulumi_kubernetes/scheduling/v1alpha1/PriorityClass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__(
Expand Down
7 changes: 7 additions & 0 deletions sdk/python/pulumi_kubernetes/scheduling/v1beta1/PriorityClass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__(
Expand Down