github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92611 from liggitt/go1.13

Browse Source 
Tolerate go 1.13 builds
This commit is contained in:
Kubernetes Prow Robot 2020-07-09 00:05:50 -07:00 committed by GitHub
commit 896da2253c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 56 additions and 526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -6,7 +6,7 @@
module k8s.io/kubernetes module k8s.io/kubernetes
go 1.14 go 1.13
require ( require (
bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690 bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690

2
hack/tools/go.mod
View File

@ -1,6 +1,6 @@
module k8s.io/kubernetes/hack/tools module k8s.io/kubernetes/hack/tools
go 1.14 go 1.13
require ( require (
github.com/bazelbuild/bazel-gazelle v0.19.1-0.20191105222053-70208cbdc798 github.com/bazelbuild/bazel-gazelle v0.19.1-0.20191105222053-70208cbdc798

2
staging/src/k8s.io/api/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/api module k8s.io/api
go 1.14 go 1.13
require ( require (
github.com/gogo/protobuf v1.3.1 github.com/gogo/protobuf v1.3.1

2
staging/src/k8s.io/apiextensions-apiserver/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/apiextensions-apiserver module k8s.io/apiextensions-apiserver
go 1.14 go 1.13
require ( require (
github.com/emicklei/go-restful v2.9.5+incompatible github.com/emicklei/go-restful v2.9.5+incompatible

2
staging/src/k8s.io/apimachinery/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/apimachinery module k8s.io/apimachinery
go 1.14 go 1.13
require ( require (
github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew v1.1.1

2
staging/src/k8s.io/apiserver/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/apiserver module k8s.io/apiserver
go 1.14 go 1.13
require ( require (
github.com/coreos/go-oidc v2.1.0+incompatible github.com/coreos/go-oidc v2.1.0+incompatible

2
staging/src/k8s.io/cli-runtime/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/cli-runtime module k8s.io/cli-runtime
go 1.14 go 1.13
require ( require (
github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew v1.1.1

2
staging/src/k8s.io/client-go/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/client-go module k8s.io/client-go
go 1.14 go 1.13
require ( require (
cloud.google.com/go v0.51.0 // indirect cloud.google.com/go v0.51.0 // indirect

2
staging/src/k8s.io/cloud-provider/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/cloud-provider module k8s.io/cloud-provider
go 1.14 go 1.13
require ( require (
github.com/google/go-cmp v0.4.0 github.com/google/go-cmp v0.4.0

2
staging/src/k8s.io/cluster-bootstrap/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/cluster-bootstrap module k8s.io/cluster-bootstrap
go 1.14 go 1.13
require ( require (
github.com/stretchr/testify v1.4.0 github.com/stretchr/testify v1.4.0

2
staging/src/k8s.io/code-generator/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/code-generator module k8s.io/code-generator
go 1.14 go 1.13
require ( require (
github.com/emicklei/go-restful v2.9.5+incompatible // indirect github.com/emicklei/go-restful v2.9.5+incompatible // indirect

1
staging/src/k8s.io/component-base/cli/flag/BUILD
View File

@ -24,6 +24,7 @@ go_library(
name = "go_default_library", name = "go_default_library",
srcs = [ srcs = [
"ciphersuites_flag.go", "ciphersuites_flag.go",
"ciphersuites_flag_114.go",
"colon_separated_multimap_string_string.go", "colon_separated_multimap_string_string.go",
"configuration_map.go", "configuration_map.go",
"flags.go", "flags.go",

4
staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag.go
View File

@ -46,10 +46,6 @@ var ciphers = map[string]uint16{
"TLS_AES_128_GCM_SHA256": tls.TLS_AES_128_GCM_SHA256, "TLS_AES_128_GCM_SHA256": tls.TLS_AES_128_GCM_SHA256,
"TLS_CHACHA20_POLY1305_SHA256": tls.TLS_CHACHA20_POLY1305_SHA256, "TLS_CHACHA20_POLY1305_SHA256": tls.TLS_CHACHA20_POLY1305_SHA256,
"TLS_AES_256_GCM_SHA384": tls.TLS_AES_256_GCM_SHA384, "TLS_AES_256_GCM_SHA384": tls.TLS_AES_256_GCM_SHA384,
// support official IANA names as well
"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256": tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256": tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
} }
// to be replaced by tls.InsecureCipherSuites() when the project migrates to go1.14. // to be replaced by tls.InsecureCipherSuites() when the project migrates to go1.14.

29
staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag_114.go Normal file
View File

@ -0,0 +1,29 @@
// +build go1.14
/*
Copyright 2020 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package flag
import (
"crypto/tls"
)
func init() {
// support official IANA names as well on go1.14
ciphers["TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"] = tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
ciphers["TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"] = tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
}

2
staging/src/k8s.io/component-base/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/component-base module k8s.io/component-base
go 1.14 go 1.13
require ( require (
github.com/blang/semver v3.5.0+incompatible github.com/blang/semver v3.5.0+incompatible

2
staging/src/k8s.io/controller-manager/go.mod
View File

@ -2,6 +2,6 @@
module k8s.io/controller-manager module k8s.io/controller-manager
go 1.14 go 1.13
replace k8s.io/controller-manager => ../controller-manager replace k8s.io/controller-manager => ../controller-manager

2
staging/src/k8s.io/cri-api/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/cri-api module k8s.io/cri-api
go 1.14 go 1.13
require ( require (
github.com/davecgh/go-spew v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect

2
staging/src/k8s.io/csi-translation-lib/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/csi-translation-lib module k8s.io/csi-translation-lib
go 1.14 go 1.13
require ( require (
github.com/stretchr/testify v1.4.0 github.com/stretchr/testify v1.4.0

2
staging/src/k8s.io/kube-aggregator/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/kube-aggregator module k8s.io/kube-aggregator
go 1.14 go 1.13
require ( require (
github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew v1.1.1

2
staging/src/k8s.io/kube-controller-manager/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/kube-controller-manager module k8s.io/kube-controller-manager
go 1.14 go 1.13
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0

2
staging/src/k8s.io/kube-proxy/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/kube-proxy module k8s.io/kube-proxy
go 1.14 go 1.13
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0

2
staging/src/k8s.io/kube-scheduler/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/kube-scheduler module k8s.io/kube-scheduler
go 1.14 go 1.13
require ( require (
github.com/google/go-cmp v0.4.0 github.com/google/go-cmp v0.4.0

2
staging/src/k8s.io/kubectl/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/kubectl module k8s.io/kubectl
go 1.14 go 1.13
require ( require (
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd

2
staging/src/k8s.io/kubelet/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/kubelet module k8s.io/kubelet
go 1.14 go 1.13
require ( require (
github.com/gogo/protobuf v1.3.1 github.com/gogo/protobuf v1.3.1

2
staging/src/k8s.io/legacy-cloud-providers/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/legacy-cloud-providers module k8s.io/legacy-cloud-providers
go 1.14 go 1.13
require ( require (
cloud.google.com/go v0.51.0 cloud.google.com/go v0.51.0

2
staging/src/k8s.io/metrics/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/metrics module k8s.io/metrics
go 1.14 go 1.13
require ( require (
github.com/gogo/protobuf v1.3.1 github.com/gogo/protobuf v1.3.1

2
staging/src/k8s.io/sample-apiserver/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/sample-apiserver module k8s.io/sample-apiserver
go 1.14 go 1.13
require ( require (
github.com/go-openapi/spec v0.19.3 github.com/go-openapi/spec v0.19.3

2
staging/src/k8s.io/sample-cli-plugin/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/sample-cli-plugin module k8s.io/sample-cli-plugin
go 1.14 go 1.13
require ( require (
github.com/spf13/cobra v1.0.0 github.com/spf13/cobra v1.0.0

2
staging/src/k8s.io/sample-controller/go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/sample-controller module k8s.io/sample-controller
go 1.14 go 1.13
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0

496
vendor/modules.txt vendored
View File

File diff suppressed because it is too large Load Diff