diff --git a/components/kubernetes/argorollouts/helm.go b/components/kubernetes/argorollouts/helm.go index f20e6648f..57e557307 100644 --- a/components/kubernetes/argorollouts/helm.go +++ b/components/kubernetes/argorollouts/helm.go @@ -1,6 +1,7 @@ package argorollouts import ( + "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes" corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/core/v1" metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/meta/v1" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" @@ -11,13 +12,13 @@ import ( type HelmValues pulumi.Map -func NewHelmInstallation(e config.Env, params *Params, opts ...pulumi.ResourceOption) (*HelmComponent, error) { +func NewHelmInstallation(e config.Env, params *Params, kubernetesProvider *kubernetes.Provider, opts ...pulumi.ResourceOption) (*HelmComponent, error) { helmComponent := &HelmComponent{} if err := e.Ctx().RegisterComponentResource("dd:argorollouts", "argorollouts", helmComponent, opts...); err != nil { return nil, err } - opts = append(opts, pulumi.Parent(helmComponent)) + opts = append(opts, pulumi.Parent(helmComponent), pulumi.DeletedWith(kubernetesProvider), pulumi.Provider(kubernetesProvider)) helmValues := pulumi.Map{} if params.HelmValues != nil { diff --git a/scenarios/aws/eks/run.go b/scenarios/aws/eks/run.go index a6a4544a5..d747b06b8 100644 --- a/scenarios/aws/eks/run.go +++ b/scenarios/aws/eks/run.go @@ -53,7 +53,7 @@ func Run(ctx *pulumi.Context) error { if err != nil { return err } - argoRollout, err = argorollouts.NewHelmInstallation(&awsEnv, argoParams, pulumi.Provider(cluster.KubeProvider)) + argoRollout, err = argorollouts.NewHelmInstallation(&awsEnv, argoParams, cluster.KubeProvider) if err != nil { return err } diff --git a/scenarios/aws/kindvm/run.go b/scenarios/aws/kindvm/run.go index 4c3493b84..c417d2844 100644 --- a/scenarios/aws/kindvm/run.go +++ b/scenarios/aws/kindvm/run.go @@ -82,7 +82,7 @@ func Run(ctx *pulumi.Context) error { if err != nil { return err } - argoRollout, err = argorollouts.NewHelmInstallation(&awsEnv, argoParams, pulumi.Provider(kindKubeProvider)) + argoRollout, err = argorollouts.NewHelmInstallation(&awsEnv, argoParams, kindKubeProvider) if err != nil { return err }