Skip to content

Commit

Permalink
Merge pull request #21 from pulumi/upgrade-pulumi-deps
Browse files Browse the repository at this point in the history
Upgrade to pulumi v3.37.2
  • Loading branch information
stack72 committed Aug 8, 2022
2 parents d220456 + 99c2ce3 commit c2a8f00
Show file tree
Hide file tree
Showing 54 changed files with 288 additions and 70 deletions.
122 changes: 122 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
comment-notification:
if: github.event_name == 'repository_dispatch'
name: comment-notification
runs-on: ubuntu-latest
steps:
- id: run-url
name: Create URL to the run output
run: echo ::set-output
name=run-url::https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID
- name: Update with Result
uses: peter-evans/create-or-update-comment@v1
with:
body: "Please view the PR build: ${{ steps.run-url.outputs.run-url }}"
issue-number: ${{ github.event.client_payload.github.payload.issue.number }}
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
token: ${{ secrets.PULUMI_BOT_TOKEN }}
build_binary:
if: github.event_name == 'repository_dispatch' ||
github.event.pull_request.head.repo.full_name == github.repository
name: Build Provider Binary
runs-on: macos-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2
- name: Unshallow clone for tags
run: git fetch --prune --unshallow --tags
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.18.x
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.1.0
with:
repo: pulumi/pulumictl
- name: Install Pulumi CLI
uses: pulumi/action-install-pulumi-cli@v1.0.1
- name: Set PreRelease Version
run: echo "GORELEASER_CURRENT_TAG=v$(pulumictl get version --language generic)"
>> $GITHUB_ENV
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
with:
args: -f .goreleaser-prerelease.yml --rm-dist --skip-validate
version: latest
build_sdk:
if: github.event_name == 'repository_dispatch' ||
github.event.pull_request.head.repo.full_name == github.repository
name: Build SDKs
runs-on: ubuntu-latest
needs: build_binary
steps:
- name: Checkout Repo
uses: actions/checkout@v2
- name: Unshallow clone for tags
run: git fetch --prune --unshallow --tags
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: ${{ matrix.goversion }}
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.1.0
with:
repo: pulumi/pulumictl
- name: Install Pulumi CLI
uses: pulumi/action-install-pulumi-cli@v1.0.1
- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: ${{matrix.nodeversion}}
- name: Setup DotNet
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{matrix.dotnetverson}}
- name: Setup Python
uses: actions/setup-python@v1
with:
python-version: ${{matrix.pythonversion}}
- name: Build SDK
run: make build_${{ matrix.language }}_sdk
- name: Check worktree clean
run: |
git update-index -q --refresh
if ! git diff-files --quiet; then
>&2 echo "error: working tree is not clean, aborting!"
git status
git diff
exit 1
fi
strategy:
fail-fast: true
matrix:
dotnetversion:
- 3.1.301
goversion:
- 1.18.x
language:
- nodejs
- python
- dotnet
- go
nodeversion:
- 14.x
pythonversion:
- "3.9"
name: CI
"on":
pull_request:
branches:
- master
- main
push:
branches:
- main
paths-ignore:
- "**.md"
tags-ignore:
- v*
- sdk/*
- "**"
23 changes: 23 additions & 0 deletions .github/workflows/command-dispatch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
command-dispatch-for-testing:
name: command-dispatch-for-testing
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2
- uses: peter-evans/slash-command-dispatch@v2
with:
commands: run-acceptance-tests
issue-type: pull-request
permission: write
reaction-token: ${{ secrets.GITHUB_TOKEN }}
repository: pulumi/pulumi-aws
token: ${{ secrets.PULUMI_BOT_TOKEN }}
name: command-dispatch
on:
issue_comment:
types:
- created
- edited
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.18.x
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.1.0
with:
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
dotnetversion:
- 3.1.301
goversion:
- 1.16.x
- 1.18.x
language:
- nodejs
- python
Expand Down
27 changes: 27 additions & 0 deletions .goreleaser-prerelease.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
archives:
- id: archive
name_template: '{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}'
before:
hooks:
- make build_provider
builds:
- binary: pulumi-resource-kubernetes-ingress-nginx
dir: provider
env:
- CGO_ENABLED=0
goarch:
- amd64
- arm64
goos:
- darwin
- windows
- linux
ldflags:
- -X github.com/pulumi/pulumi-kubernetes-ingress-nginx/pkg/version.Version={{.Tag }}
main: ./cmd/pulumi-resource-kubernetes-ingress-nginx/
changelog:
skip: true
release:
disable: true
snapshot:
name_template: '{{ .Tag }}-SNAPSHOT'
12 changes: 6 additions & 6 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ go 1.18
require (
github.com/pkg/errors v0.9.1
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.36.0
github.com/pulumi/pulumi/sdk/v3 v3.36.0
github.com/pulumi/pulumi-kubernetes/sdk/v3 v3.20.1
github.com/pulumi/pulumi/pkg/v3 v3.37.2
github.com/pulumi/pulumi/sdk/v3 v3.37.2
)

require (
Expand All @@ -32,7 +32,7 @@ require (
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
Expand Down Expand Up @@ -134,11 +134,11 @@ require (
go.uber.org/atomic v1.9.0 // indirect
gocloud.dev v0.24.0 // indirect
gocloud.dev/secrets/hashivault v0.24.0 // indirect
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 // indirect
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
Expand Down
23 changes: 12 additions & 11 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXY
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY=
github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8=
github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw=
github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
Expand Down Expand Up @@ -687,14 +687,14 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
github.com/pulumi/pulumi-go-helmbase v0.0.14 h1:QhXW3s4HRZlNI4TB1DCCJ285jqvhLNaJohEw2RoeZi4=
github.com/pulumi/pulumi-go-helmbase v0.0.14/go.mod h1:1S15MZHmIKZTEZXzlAfSIzG0hFpnOC0I5yQmlDqJm3g=
github.com/pulumi/pulumi-kubernetes/sdk/v3 v3.18.3/go.mod h1:w+Y1d8uqc+gv7JYWLF4rfzvTsIIHR1SCL+GG6sX1xMM=
github.com/pulumi/pulumi-kubernetes/sdk/v3 v3.19.1 h1:GoSbF0gAD6uDVxlVJFsJO8UgSaEEMPqk2r7iK8R5EZY=
github.com/pulumi/pulumi-kubernetes/sdk/v3 v3.19.1/go.mod h1:w+Y1d8uqc+gv7JYWLF4rfzvTsIIHR1SCL+GG6sX1xMM=
github.com/pulumi/pulumi/pkg/v3 v3.36.0 h1:lsKclMmsdas+IDrpMCcjr4iu/+F3WspZDpMQRkgI3us=
github.com/pulumi/pulumi/pkg/v3 v3.36.0/go.mod h1:tKeUmcAqWDJhgc4dAbWx7eiJ5oF5DHvy2fujT/aipvw=
github.com/pulumi/pulumi-kubernetes/sdk/v3 v3.20.1 h1:1Ywp5sOEHXAoEuZhtlG/RowgZtB9KQvrZxFK1OLOHeQ=
github.com/pulumi/pulumi-kubernetes/sdk/v3 v3.20.1/go.mod h1:QayLDfYNZY2zIDHtiLIPQEUN+A3IBpDFSlgK/64qOiw=
github.com/pulumi/pulumi/pkg/v3 v3.37.2 h1:kWuWLeq1XDlkmgP+XHIhuP/J9Q/K4AfJL2tiqdE0EJE=
github.com/pulumi/pulumi/pkg/v3 v3.37.2/go.mod h1:q9z+0WeX9vftyKIOAbeaeNC05kzK9dQNq3ia+gHjgKQ=
github.com/pulumi/pulumi/sdk/v3 v3.16.0/go.mod h1:252ou/zAU1g6E8iTwe2Y9ht7pb5BDl2fJlOuAgZCHiA=
github.com/pulumi/pulumi/sdk/v3 v3.31.1/go.mod h1:hGo/+AL1L4sPL9Ukd/i5bNFM3WHs3dHcA+GKEW7M3RA=
github.com/pulumi/pulumi/sdk/v3 v3.36.0 h1:ErXvg+PXrVGvAVeLCgy/i2E0468+a/s5jURnMeXMvKY=
github.com/pulumi/pulumi/sdk/v3 v3.36.0/go.mod h1:e1xuPnh9aKzCesrFf96DEzcybLdRWRMhKeKVBmb2lm0=
github.com/pulumi/pulumi/sdk/v3 v3.37.2 h1:tiPIZOWcOw/FmU8WHAOPePYiJm74yFc1DXLxDF1VKKo=
github.com/pulumi/pulumi/sdk/v3 v3.37.2/go.mod h1:e1xuPnh9aKzCesrFf96DEzcybLdRWRMhKeKVBmb2lm0=
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
Expand Down Expand Up @@ -849,8 +849,8 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE=
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
Expand Down Expand Up @@ -1063,8 +1063,9 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 h1:eJv7u3ksNXoLbGSKuv2s/SIO4tJVxc/A+MTpzxDgz/Q=
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
Expand Down
5 changes: 3 additions & 2 deletions sdk/dotnet/IngressController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Pulumi.KubernetesIngressNginx
/// Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
/// </summary>
[KubernetesIngressNginxResourceType("kubernetes-ingress-nginx:index:IngressController")]
public partial class IngressController : Pulumi.ComponentResource
public partial class IngressController : global::Pulumi.ComponentResource
{
/// <summary>
/// Detailed information about the status of the underlying Helm deployment.
Expand Down Expand Up @@ -47,7 +47,7 @@ private static ComponentResourceOptions MakeResourceOptions(ComponentResourceOpt
}
}

public sealed class IngressControllerArgs : Pulumi.ResourceArgs
public sealed class IngressControllerArgs : global::Pulumi.ResourceArgs
{
[Input("controller")]
public Input<Inputs.ControllerArgs>? Controller { get; set; }
Expand Down Expand Up @@ -142,5 +142,6 @@ public InputMap<ImmutableDictionary<string, string>> Udp
public IngressControllerArgs()
{
}
public static new IngressControllerArgs Empty => new IngressControllerArgs();
}
}
3 changes: 2 additions & 1 deletion sdk/dotnet/Inputs/AutoscalingArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Pulumi.KubernetesIngressNginx.Inputs
{

public sealed class AutoscalingArgs : Pulumi.ResourceArgs
public sealed class AutoscalingArgs : global::Pulumi.ResourceArgs
{
[Input("annotations")]
private InputMap<string>? _annotations;
Expand Down Expand Up @@ -41,5 +41,6 @@ public InputMap<string> Annotations
public AutoscalingArgs()
{
}
public static new AutoscalingArgs Empty => new AutoscalingArgs();
}
}
3 changes: 2 additions & 1 deletion sdk/dotnet/Inputs/AutoscalingBehaviorArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Pulumi.KubernetesIngressNginx.Inputs
{

public sealed class AutoscalingBehaviorArgs : Pulumi.ResourceArgs
public sealed class AutoscalingBehaviorArgs : global::Pulumi.ResourceArgs
{
[Input("scaleDown")]
public Input<Inputs.AutoscalingBehaviorScalingArgs>? ScaleDown { get; set; }
Expand All @@ -21,5 +21,6 @@ public sealed class AutoscalingBehaviorArgs : Pulumi.ResourceArgs
public AutoscalingBehaviorArgs()
{
}
public static new AutoscalingBehaviorArgs Empty => new AutoscalingBehaviorArgs();
}
}
3 changes: 2 additions & 1 deletion sdk/dotnet/Inputs/AutoscalingBehaviorScalingArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Pulumi.KubernetesIngressNginx.Inputs
{

public sealed class AutoscalingBehaviorScalingArgs : Pulumi.ResourceArgs
public sealed class AutoscalingBehaviorScalingArgs : global::Pulumi.ResourceArgs
{
[Input("policies")]
private InputList<Inputs.AutoscalingBehaviorScalingPolicyArgs>? _policies;
Expand All @@ -26,5 +26,6 @@ public InputList<Inputs.AutoscalingBehaviorScalingPolicyArgs> Policies
public AutoscalingBehaviorScalingArgs()
{
}
public static new AutoscalingBehaviorScalingArgs Empty => new AutoscalingBehaviorScalingArgs();
}
}
3 changes: 2 additions & 1 deletion sdk/dotnet/Inputs/AutoscalingBehaviorScalingPolicyArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Pulumi.KubernetesIngressNginx.Inputs
{

public sealed class AutoscalingBehaviorScalingPolicyArgs : Pulumi.ResourceArgs
public sealed class AutoscalingBehaviorScalingPolicyArgs : global::Pulumi.ResourceArgs
{
[Input("periodSeconds")]
public Input<int>? PeriodSeconds { get; set; }
Expand All @@ -24,5 +24,6 @@ public sealed class AutoscalingBehaviorScalingPolicyArgs : Pulumi.ResourceArgs
public AutoscalingBehaviorScalingPolicyArgs()
{
}
public static new AutoscalingBehaviorScalingPolicyArgs Empty => new AutoscalingBehaviorScalingPolicyArgs();
}
}
3 changes: 2 additions & 1 deletion sdk/dotnet/Inputs/AutoscalingTemplateArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Pulumi.KubernetesIngressNginx.Inputs
{

public sealed class AutoscalingTemplateArgs : Pulumi.ResourceArgs
public sealed class AutoscalingTemplateArgs : global::Pulumi.ResourceArgs
{
[Input("pods")]
public Input<Inputs.AutoscalingTemplatePodsArgs>? Pods { get; set; }
Expand All @@ -21,5 +21,6 @@ public sealed class AutoscalingTemplateArgs : Pulumi.ResourceArgs
public AutoscalingTemplateArgs()
{
}
public static new AutoscalingTemplateArgs Empty => new AutoscalingTemplateArgs();
}
}
Loading

0 comments on commit c2a8f00

Please sign in to comment.