diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f298c0f96..0316eb61e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## HEAD (Unreleased) +### Bug Fixes + +- Handle networking/v1beta1 Ingress resources. (https://github.com/pulumi/pulumi-kubernetes/pull/1221) + ### Improvements - Add NodeJS usage examples for Helm, Kustomize, and YAML resources. (https://github.com/pulumi/pulumi-kubernetes/pull/1205) diff --git a/provider/pkg/await/ingress.go b/provider/pkg/await/ingress.go index 7afb86e361..c70970e7ca 100644 --- a/provider/pkg/await/ingress.go +++ b/provider/pkg/await/ingress.go @@ -7,16 +7,15 @@ import ( "reflect" "time" - "github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" - "github.com/pkg/errors" "github.com/pulumi/pulumi-kubernetes/provider/v2/pkg/clients" "github.com/pulumi/pulumi-kubernetes/provider/v2/pkg/kinds" "github.com/pulumi/pulumi-kubernetes/provider/v2/pkg/metadata" "github.com/pulumi/pulumi-kubernetes/provider/v2/pkg/openapi" "github.com/pulumi/pulumi/sdk/v2/go/common/diag" + "github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" logger "github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" - "k8s.io/api/extensions/v1beta1" + networkingv1b1 "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" @@ -298,12 +297,12 @@ func (iia *ingressInitAwaiter) processIngressEvent(event watch.Event) { inputIngressName) } -func decodeIngress(u *unstructured.Unstructured) (*v1beta1.Ingress, error) { +func decodeIngress(u *unstructured.Unstructured) (*networkingv1b1.Ingress, error) { b, err := u.MarshalJSON() if err != nil { return nil, err } - var obj v1beta1.Ingress + var obj networkingv1b1.Ingress err = json.Unmarshal(b, &obj) if err != nil { return nil, err diff --git a/provider/pkg/clients/unstructured.go b/provider/pkg/clients/unstructured.go index bef7a545e0..f53f158756 100644 --- a/provider/pkg/clients/unstructured.go +++ b/provider/pkg/clients/unstructured.go @@ -22,7 +22,7 @@ import ( appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + networkingv1b1 "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) @@ -40,7 +40,7 @@ func FromUnstructured(obj *unstructured.Unstructured) (metav1.Object, error) { case kinds.Job: output = new(batchv1.Job) case kinds.Ingress: - output = new(v1beta1.Ingress) + output = new(networkingv1b1.Ingress) case kinds.PersistentVolume: output = new(corev1.PersistentVolume) case kinds.PersistentVolumeClaim: