Merge pull request #6 from pulumi/rshade/update-helm-base

Updating helmbase, kubernetes, and pulumi dependencies, fixes #4

Author: rshade

.gitignore

@@ -16,3 +16,5 @@ ci-scripts/
 *.tar.gz
 
 /provider/cmd/pulumi-resource-*/schema.go
+.vscode/
+**/*.bak

Makefile

@@ -5,7 +5,7 @@ PROJECT         := github.com/pulumi/pulumi-${PACK}
 
 PROVIDER        := pulumi-resource-${PACK}
 CODEGEN         := pulumi-gen-${PACK}
-VERSION_PATH    := provider/pkg/version.Version
+VERSION_PATH    := pkg/version.Version
 
 WORKING_DIR     := $(shell pwd)
 SCHEMA_PATH     := ${WORKING_DIR}/schema.json

examples/simple-nginx-ts/index.ts

@@ -5,6 +5,9 @@
 import * as k8s from "@pulumi/kubernetes";
 import * as nginx from "@pulumi/kubernetes-ingress-nginx";
 
+// Create a sandbox namespace.
+const ns = new k8s.core.v1.Namespace("sandbox-ns");
+
 // Install the NGINX ingress controller to our cluster. The controller
 // consists of a Pod and a Service. Install it and configure the controller
 // to publish the load balancer IP address on each Ingress so that
@@ -15,6 +18,9 @@ const ctrl = new nginx.IngressController("myctrl", {
             enabled: true,
         },
     },
+    helmOptions: {
+        namespace: ns.metadata.name,
+    },
 });
 
 // Now let's deploy two applications which are identical except for the
@@ -25,15 +31,21 @@ const appBase = "hello-k8s";
 const appNames = [ `${appBase}-first`, `${appBase}-second` ];
 for (const appName of appNames) {
     const appSvc = new k8s.core.v1.Service(`${appName}-svc`, {
-        metadata: { name: appName },
+        metadata: { 
+            name: appName,
+            namespace: ns.metadata.name
+        },
         spec: {
             type: "ClusterIP",
             ports: [{ port: 80, targetPort: 8080 }],
             selector: { app: appName },
         },
     });
     const appDep = new k8s.apps.v1.Deployment(`${appName}-dep`, {
-        metadata: { name: appName },
+        metadata: { 
+            name: appName,
+            namespace: ns.metadata.name
+        },
         spec: {
             replicas: 3,
             selector: {
@@ -64,6 +76,7 @@ const appIngress = new k8s.networking.v1.Ingress(`${appBase}-ingress`, {
         annotations: {
             "kubernetes.io/ingress.class": "nginx",
         },
+        namespace: ns.metadata.name
     },
     spec: {
         rules: [

provider/go.mod

@@ -1,11 +1,11 @@
 module github.com/pulumi/pulumi-kubernetes-ingress-nginx
 
-go 1.15
+go 1.16
 
 require (
-	github.com/joeduffy/pulumi-go-helmbase v0.0.11
 	github.com/pkg/errors v0.9.1
-	github.com/pulumi/pulumi-kubernetes/sdk/v3 v3.7.3
-	github.com/pulumi/pulumi/pkg/v3 v3.12.0
-	github.com/pulumi/pulumi/sdk/v3 v3.13.2
+	github.com/pulumi/pulumi-go-helmbase v0.0.14
+	github.com/pulumi/pulumi-kubernetes/sdk/v3 v3.19.1
+	github.com/pulumi/pulumi/pkg/v3 v3.32.1
+	github.com/pulumi/pulumi/sdk/v3 v3.32.1
 )

provider/go.sum

@@ -15,6 +15,7 @@
 package provider
 
 import (
+	helmbase "github.com/pulumi/pulumi-go-helmbase"
 	corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/core/v1"
 	helmv3 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/helm/v3"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
@@ -68,10 +69,10 @@ type IngressControllerArgs struct {
 
 	// HelmOptions is an escape hatch that lets the end user control any aspect of the
 	// Helm deployment. This exposes the entirety of the underlying Helm Release component args.
-	HelmOptions *helmv3.ReleaseType `pulumi:"helmOptions" pschema:"ref=#/types/chart-ingress-nginx:index:Release" json:"-"`
+	HelmOptions *helmbase.ReleaseType `pulumi:"helmOptions" pschema:"ref=#/types/chart-ingress-nginx:index:Release" json:"-"`
 }
 
-func (args *IngressControllerArgs) R() **helmv3.ReleaseType { return &args.HelmOptions }
+func (args *IngressControllerArgs) R() **helmbase.ReleaseType { return &args.HelmOptions }
 
 type Controller struct {
 	Name  *string          `pulumi:"name"`

provider/pkg/provider/chart.go

@@ -15,7 +15,7 @@
 package provider
 
 import (
-	helmbase "github.com/joeduffy/pulumi-go-helmbase"
+	helmbase "github.com/pulumi/pulumi-go-helmbase"
 
 	"github.com/pulumi/pulumi/pkg/v3/resource/provider"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"

provider/pkg/provider/provider.go

@@ -39,11 +39,19 @@
     <None Include="version.txt" Pack="True" PackagePath="content" />
   </ItemGroup>
 
+   <ItemGroup>
+    <EmbeddedResource Include="pulumi-plugin.json" />
+    <None Include="pulumi-plugin.json" Pack="True" PackagePath="content" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Pulumi" Version="3.*" />
     <PackageReference Include="Pulumi.Kubernetes" Version="3.*" ExcludeAssets="contentFiles" />
   </ItemGroup>
 
+  <ItemGroup>
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="logo.png">
       <Pack>True</Pack>

sdk/dotnet/Pulumi.KubernetesIngressNginx.csproj

@@ -1,11 +1,6 @@
 // *** WARNING: this file was generated by Pulumi SDK Generator. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-using System;
-using System.IO;
-using System.Reflection;
-using Pulumi;
-
 namespace Pulumi.KubernetesIngressNginx
 {
     static class Utilities
@@ -14,7 +9,7 @@ static class Utilities
         {
             foreach (var n in names)
             {
-                var value = Environment.GetEnvironmentVariable(n);
+                var value = global::System.Environment.GetEnvironmentVariable(n);
                 if (value != null)
                 {
                     return value;
@@ -30,11 +25,11 @@ static class Utilities
             var s = GetEnv(names);
             if (s != null)
             {
-                if (Array.IndexOf(trueValues, s) != -1)
+                if (global::System.Array.IndexOf(trueValues, s) != -1)
                 {
                     return true;
                 }
-                if (Array.IndexOf(falseValues, s) != -1)
+                if (global::System.Array.IndexOf(falseValues, s) != -1)
                 {
                     return false;
                 }
@@ -46,28 +41,29 @@ static class Utilities
 
         public static double? GetEnvDouble(params string[] names) => double.TryParse(GetEnv(names), out double v) ? (double?)v : null;
 
-        public static InvokeOptions WithVersion(this InvokeOptions? options)
+        [global::System.Obsolete("Please use WithDefaults instead")]
+        public static global::Pulumi.InvokeOptions WithVersion(this global::Pulumi.InvokeOptions? options)
         {
-            if (options?.Version != null)
-            {
-                return options;
-            }
-            return new InvokeOptions
-            {
-                Parent = options?.Parent,
-                Provider = options?.Provider,
-                Version = Version,
-            };
+            var dst = options ?? new global::Pulumi.InvokeOptions{};
+            dst.Version = options?.Version ?? Version;
+            return dst;
+        }
+
+        public static global::Pulumi.InvokeOptions WithDefaults(this global::Pulumi.InvokeOptions? src)
+        {
+            var dst = src ?? new global::Pulumi.InvokeOptions{};
+            dst.Version = src?.Version ?? Version;
+            return dst;
         }
 
         private readonly static string version;
         public static string Version => version;
 
         static Utilities()
         {
-            var assembly = typeof(Utilities).GetTypeInfo().Assembly;
+            var assembly = global::System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(Utilities)).Assembly;
             using var stream = assembly.GetManifestResourceStream("Pulumi.KubernetesIngressNginx.version.txt");
-            using var reader = new StreamReader(stream ?? throw new NotSupportedException("Missing embedded version.txt file"));
+            using var reader = new global::System.IO.StreamReader(stream ?? throw new global::System.NotSupportedException("Missing embedded version.txt file"));
             version = reader.ReadToEnd().Trim();
             var parts = version.Split("\n");
             if (parts.Length == 2)

sdk/dotnet/Utilities.cs

@@ -0,0 +1,4 @@
+{
+  "resource": true,
+  "name": "kubernetes-ingress-nginx"
+}