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.

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

Upgrade provider deps #1861

Merged
merged 6 commits into from
Jan 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
strategy:
matrix:
platform: [ ubuntu-latest ]
go-version: [ 1.16.x ]
go-version: [ 1.17.x ]
node-version: [ 14.x ]
python-version: [ 3.7 ]
dotnet-version: [ '3.1.100' ]
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.1.0
with:
Expand Down Expand Up @@ -234,7 +234,7 @@ jobs:
dotnetversion:
- 3.1.301
goversion:
- 1.16.x
- 1.17.x
language:
- nodejs
- python
Expand Down Expand Up @@ -354,7 +354,7 @@ jobs:
dotnetversion:
- 3.1.301
goversion:
- 1.16.x
- 1.17.x
language:
- nodejs
- python
Expand All @@ -370,7 +370,7 @@ jobs:
strategy:
matrix:
platform: [ ubuntu-latest ]
go-version: [ 1.16.x ]
go-version: [ 1.17.x ]
node-version: [ 14.x ]
python-version: [ 3.7 ]
dotnet-version: [ '3.1.100' ]
Expand Down Expand Up @@ -431,7 +431,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ 1.16.x ]
go-version: [ 1.17.x ]
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand All @@ -455,7 +455,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.1.0
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
strategy:
matrix:
platform: [ ubuntu-latest ]
go-version: [ 1.16.x ]
go-version: [ 1.17.x ]
node-version: [ 14.x ]
python-version: [ 3.7 ]
dotnet-version: [ '3.1.100' ]
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.1.0
with:
Expand Down Expand Up @@ -224,7 +224,7 @@ jobs:
dotnetversion:
- 3.1.301
goversion:
- 1.16.x
- 1.17.x
language:
- nodejs
- python
Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
dotnetversion:
- 3.1.301
goversion:
- 1.16.x
- 1.17.x
language:
- nodejs
- python
Expand All @@ -360,7 +360,7 @@ jobs:
strategy:
matrix:
platform: [ ubuntu-latest ]
go-version: [ 1.16.x ]
go-version: [ 1.17.x ]
node-version: [ 14.x ]
python-version: [ 3.7 ]
dotnet-version: [ '3.1.100' ]
Expand Down Expand Up @@ -440,7 +440,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.1.0
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
strategy:
matrix:
platform: [ ubuntu-latest ]
go-version: [ 1.16.x ]
go-version: [ 1.17.x ]
node-version: [ 14.x ]
python-version: [ 3.7 ]
dotnet-version: [ '3.1.100' ]
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.1.0
with:
Expand Down Expand Up @@ -224,7 +224,7 @@ jobs:
dotnetversion:
- 3.1.301
goversion:
- 1.16.x
- 1.17.x
language:
- nodejs
- python
Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
dotnetversion:
- 3.1.301
goversion:
- 1.16.x
- 1.17.x
language:
- nodejs
- python
Expand All @@ -360,7 +360,7 @@ jobs:
strategy:
matrix:
platform: [ ubuntu-latest ]
go-version: [ 1.16.x ]
go-version: [ 1.17.x ]
node-version: [ 14.x ]
python-version: [ 3.7 ]
dotnet-version: [ '3.1.100' ]
Expand Down Expand Up @@ -440,7 +440,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.1.0
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/run-acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
strategy:
matrix:
platform: [ ubuntu-latest ]
go-version: [ 1.16.x ]
go-version: [ 1.17.x ]
node-version: [ 14.x ]
python-version: [ 3.7 ]
dotnet-version: [ 3.1.x ]
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.1.0
with:
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
dotnetversion:
- 3.1.x
goversion:
- 1.16.x
- 1.17.x
language:
- nodejs
- python
Expand Down Expand Up @@ -343,7 +343,7 @@ jobs:
dotnetversion:
- 3.1.x
goversion:
- 1.16.x
- 1.17.x
language:
- nodejs
- python
Expand All @@ -359,7 +359,7 @@ jobs:
strategy:
matrix:
platform: [ ubuntu-latest ]
go-version: [ 1.16.x ]
go-version: [ 1.17.x ]
node-version: [ 14.x ]
python-version: [ 3.7 ]
dotnet-version: [ 3.1.x ]
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## HEAD (Unreleased)
- Fix panic for deletions from virtual fields in Helm Release (https://github.com/pulumi/pulumi-kubernetes/pull/1850)
- Upgrade kubernetes provider module deps (https://github.com/pulumi/pulumi-kubernetes/pull/1861)

## 3.13.0 (January 7, 2022)
- Change await log type to cloud-ready-check lib (https://github.com/pulumi/pulumi-kubernetes/pull/1855)
Expand Down
72 changes: 34 additions & 38 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.17

require (
github.com/ahmetb/go-linq v3.0.0+incompatible
github.com/evanphx/json-patch v4.11.0+incompatible
github.com/evanphx/json-patch v4.12.0+incompatible
github.com/golang/protobuf v1.5.2
github.com/googleapis/gnostic v0.5.5
github.com/imdario/mergo v0.3.12
Expand All @@ -14,18 +14,18 @@ require (
github.com/pulumi/pulumi/pkg/v3 v3.19.0
github.com/pulumi/pulumi/sdk/v3 v3.19.0
github.com/stretchr/testify v1.7.0
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
google.golang.org/grpc v1.38.0
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
google.golang.org/grpc v1.43.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
helm.sh/helm/v3 v3.7.2
k8s.io/api v0.22.4
k8s.io/apimachinery v0.22.4
k8s.io/cli-runtime v0.22.4
k8s.io/client-go v0.22.4
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c
k8s.io/kubectl v0.22.4
sigs.k8s.io/kustomize/api v0.8.11
sigs.k8s.io/kustomize/kyaml v0.11.0
k8s.io/api v0.23.1
k8s.io/apimachinery v0.23.1
k8s.io/cli-runtime v0.23.1
k8s.io/client-go v0.23.1
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/kubectl v0.23.1
sigs.k8s.io/kustomize/api v0.10.1
sigs.k8s.io/kustomize/kyaml v0.13.0
sigs.k8s.io/yaml v1.2.0
)

Expand All @@ -44,8 +44,8 @@ require (
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
github.com/Masterminds/squirrel v1.5.2 // indirect
github.com/Microsoft/go-winio v0.4.17 // indirect
github.com/Microsoft/hcsshim v0.8.18 // indirect
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/Microsoft/hcsshim v0.9.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/agext/levenshtein v1.2.1 // indirect
Expand All @@ -54,9 +54,11 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
github.com/cheggaaa/pb v1.0.18 // indirect
github.com/containerd/containerd v1.5.7 // indirect
github.com/containerd/continuity v0.1.0 // indirect
github.com/containerd/cgroups v1.0.2 // indirect
github.com/containerd/containerd v1.5.9 // indirect
github.com/containerd/continuity v0.2.2 // indirect
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/djherbis/times v1.2.0 // indirect
Expand All @@ -83,12 +85,12 @@ require (
github.com/gofrs/uuid v3.3.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/gosuri/uitable v0.0.4 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
Expand All @@ -103,7 +105,7 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
github.com/klauspost/compress v1.12.2 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
github.com/lib/pq v1.10.1 // indirect
Expand All @@ -120,22 +122,23 @@ require (
github.com/mitchellh/reflectwalk v1.0.1 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.5.0 // indirect
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/runc v1.0.0-rc93 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/runc v1.0.3 // indirect
github.com/opentracing/basictracer-go v1.0.0 // indirect
github.com/opentracing/opentracing-go v1.1.0 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pgavlin/goldmark v1.1.33-0.20200616210433-b5eb04559386 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/common v0.28.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.6.1 // indirect
Expand All @@ -162,16 +165,16 @@ require (
github.com/zclconf/go-cty v1.3.1 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.uber.org/atomic v1.7.0 // indirect
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c // indirect
golang.org/x/net v0.0.0-20220105145211-5b0dc2dfae98 // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
google.golang.org/protobuf v1.26.0 // indirect
google.golang.org/genproto v0.0.0-20220106181925-4b6d468c965f // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/gorp.v1 v1.7.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
Expand All @@ -180,18 +183,11 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiextensions-apiserver v0.22.4 // indirect
k8s.io/apiserver v0.22.4 // indirect
k8s.io/component-base v0.22.4 // indirect
k8s.io/component-base v0.23.1 // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
oras.land/oras-go v0.4.0 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 // indirect
)

replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.5.4 // Work around https://github.com/advisories/GHSA-c2h3-6mxw-7mvq
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
github.com/evanphx/json-patch => github.com/evanphx/json-patch v4.11.0+incompatible
github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2 // Work around https://github.com/advisories/GHSA-77vh-xpmg-72qh
)
Loading