Skip to content

Commit b6009a9

Browse files
authored
Update kubernetes dependencies (#1574)
1 parent be047c2 commit b6009a9

File tree

545 files changed

+24046
-9922
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

545 files changed

+24046
-9922
lines changed

go.mod

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,18 @@ module github.com/hashicorp/terraform-provider-kubernetes
22

33
require (
44
cloud.google.com/go/storage v1.14.0 // indirect
5-
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
65
github.com/MakeNowJust/heredoc v1.0.0 // indirect
76
github.com/Masterminds/semver v1.5.0
87
github.com/agext/levenshtein v1.2.3 // indirect
98
github.com/aws/aws-sdk-go v1.38.20 // indirect
10-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
119
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
1210
github.com/fatih/color v1.10.0 // indirect
13-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
1411
github.com/getkin/kin-openapi v0.66.0
1512
github.com/go-errors/errors v1.1.1 // indirect
16-
github.com/go-openapi/jsonreference v0.19.5 // indirect
17-
github.com/go-openapi/spec v0.20.3 // indirect
1813
github.com/go-openapi/swag v0.19.15 // indirect
19-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
20-
github.com/google/btree v1.0.1 // indirect
2114
github.com/google/go-cmp v0.5.6
2215
github.com/google/gofuzz v1.2.0 // indirect
2316
github.com/google/uuid v1.2.0 // indirect
24-
github.com/googleapis/gnostic v0.5.5 // indirect
2517
github.com/hashicorp/errwrap v1.1.0 // indirect
2618
github.com/hashicorp/go-hclog v0.16.0
2719
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -37,7 +29,6 @@ require (
3729
github.com/hashicorp/terraform-plugin-test/v2 v2.2.1
3830
github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864 // indirect
3931
github.com/jinzhu/copier v0.2.9
40-
github.com/json-iterator/go v1.1.11 // indirect
4132
github.com/klauspost/compress v1.12.1 // indirect
4233
github.com/mailru/easyjson v0.7.7 // indirect
4334
github.com/mitchellh/go-homedir v1.1.0
@@ -57,29 +48,23 @@ require (
5748
golang.org/x/mod v0.4.2
5849
golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
5950
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
60-
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
6151
golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72 // indirect
62-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
63-
golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a // indirect
6452
google.golang.org/api v0.44.0 // indirect
65-
google.golang.org/genproto v0.0.0-20210415145412-64678f1ae2d5 // indirect
66-
google.golang.org/grpc v1.37.0
67-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
68-
k8s.io/api v0.21.7
69-
k8s.io/apiextensions-apiserver v0.21.7
70-
k8s.io/apimachinery v0.21.7
71-
k8s.io/client-go v0.21.7
72-
k8s.io/kube-aggregator v0.21.7
73-
k8s.io/kubectl v0.21.7
74-
k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
53+
google.golang.org/grpc v1.38.0
54+
k8s.io/api v0.22.4
55+
k8s.io/apiextensions-apiserver v0.22.4
56+
k8s.io/apimachinery v0.22.4
57+
k8s.io/client-go v0.22.4
58+
k8s.io/kube-aggregator v0.22.4
59+
k8s.io/kubectl v0.22.4
7560
)
7661

7762
// kustomize needs to be kept in sync with the cli-runtime.
7863
// go-openapi needs to be locked at a version that is compatible with kustomize
7964
replace (
8065
github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.9
81-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.7
82-
k8s.io/client-go => k8s.io/client-go v0.21.7
66+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.4
67+
k8s.io/client-go => k8s.io/client-go v0.22.4
8368
sigs.k8s.io/kustomize/pkg/transformers => ./vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer
8469
sigs.k8s.io/kustomize/pkg/transformers/config => ./vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer/config
8570
)

go.sum

Lines changed: 132 additions & 148 deletions
Large diffs are not rendered by default.

kubernetes/provider.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ func initializeConfiguration(d *schema.ResourceData) (*restclient.Config, error)
481481
if v, ok := d.GetOk("exec"); ok {
482482
exec := &clientcmdapi.ExecConfig{}
483483
if spec, ok := v.([]interface{})[0].(map[string]interface{}); ok {
484+
exec.InteractiveMode = clientcmdapi.IfAvailableExecInteractiveMode
484485
exec.APIVersion = spec["api_version"].(string)
485486
exec.Command = spec["command"].(string)
486487
exec.Args = expandStringSlice(spec["args"].([]interface{}))

manifest/provider/configure.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@ func (s *RawProviderServer) ConfigureProvider(ctx context.Context, req *tfprotov
517517
return response, nil
518518
}
519519
execCfg := clientcmdapi.ExecConfig{}
520+
execCfg.InteractiveMode = clientcmdapi.IfAvailableExecInteractiveMode
520521
if len(execBlock) > 0 {
521522
var execObj map[string]tftypes.Value
522523
err := execBlock[0].As(&execObj)

vendor/github.com/Azure/go-ansiterm/go.mod

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/go-ansiterm/go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/go-ansiterm/winterm/ansi.go

Lines changed: 19 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-openapi/spec/.editorconfig

Lines changed: 0 additions & 26 deletions
This file was deleted.

vendor/github.com/go-openapi/spec/.golangci.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

vendor/github.com/go-openapi/spec/.travis.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)