Merge pull request #92611 from liggitt/go1.13

Tolerate go 1.13 builds
kubernetes · Jul 9, 2020 · 896da22 · 896da22
2 parents a28e807 + ddfe137
commit 896da22
Show file tree

Hide file tree

Showing 30 changed files with 56 additions and 526 deletions.
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@
 
 module k8s.io/kubernetes
 
-go 1.14
+go 1.13
 
 require (
 	bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690

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

diff --git a/staging/src/k8s.io/api/go.mod b/staging/src/k8s.io/api/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/api
 
-go 1.14
+go 1.13
 
 require (
 	github.com/gogo/protobuf v1.3.1

diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/apiextensions-apiserver
 
-go 1.14
+go 1.13
 
 require (
 	github.com/emicklei/go-restful v2.9.5+incompatible

diff --git a/staging/src/k8s.io/apimachinery/go.mod b/staging/src/k8s.io/apimachinery/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/apimachinery
 
-go 1.14
+go 1.13
 
 require (
 	github.com/davecgh/go-spew v1.1.1

diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/apiserver
 
-go 1.14
+go 1.13
 
 require (
 	github.com/coreos/go-oidc v2.1.0+incompatible

diff --git a/staging/src/k8s.io/cli-runtime/go.mod b/staging/src/k8s.io/cli-runtime/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/cli-runtime
 
-go 1.14
+go 1.13
 
 require (
 	github.com/davecgh/go-spew v1.1.1

diff --git a/staging/src/k8s.io/client-go/go.mod b/staging/src/k8s.io/client-go/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/client-go
 
-go 1.14
+go 1.13
 
 require (
 	cloud.google.com/go v0.51.0 // indirect

diff --git a/staging/src/k8s.io/cloud-provider/go.mod b/staging/src/k8s.io/cloud-provider/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/cloud-provider
 
-go 1.14
+go 1.13
 
 require (
 	github.com/google/go-cmp v0.4.0

diff --git a/staging/src/k8s.io/cluster-bootstrap/go.mod b/staging/src/k8s.io/cluster-bootstrap/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/cluster-bootstrap
 
-go 1.14
+go 1.13
 
 require (
 	github.com/stretchr/testify v1.4.0

diff --git a/staging/src/k8s.io/code-generator/go.mod b/staging/src/k8s.io/code-generator/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/code-generator
 
-go 1.14
+go 1.13
 
 require (
 	github.com/emicklei/go-restful v2.9.5+incompatible // indirect

diff --git a/staging/src/k8s.io/component-base/cli/flag/BUILD b/staging/src/k8s.io/component-base/cli/flag/BUILD
@@ -24,6 +24,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "ciphersuites_flag.go",
+        "ciphersuites_flag_114.go",
         "colon_separated_multimap_string_string.go",
         "configuration_map.go",
         "flags.go",

diff --git a/staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag.go b/staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag.go
@@ -46,10 +46,6 @@ var ciphers = map[string]uint16{
 	"TLS_AES_128_GCM_SHA256":                  tls.TLS_AES_128_GCM_SHA256,
 	"TLS_CHACHA20_POLY1305_SHA256":            tls.TLS_CHACHA20_POLY1305_SHA256,
 	"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.

diff --git a/staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag_114.go b/staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag_114.go
@@ -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
+}
diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/component-base
 
-go 1.14
+go 1.13
 
 require (
 	github.com/blang/semver v3.5.0+incompatible

diff --git a/staging/src/k8s.io/controller-manager/go.mod b/staging/src/k8s.io/controller-manager/go.mod
@@ -2,6 +2,6 @@
 
 module k8s.io/controller-manager
 
-go 1.14
+go 1.13
 
 replace k8s.io/controller-manager => ../controller-manager
diff --git a/staging/src/k8s.io/cri-api/go.mod b/staging/src/k8s.io/cri-api/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/cri-api
 
-go 1.14
+go 1.13
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect

diff --git a/staging/src/k8s.io/csi-translation-lib/go.mod b/staging/src/k8s.io/csi-translation-lib/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/csi-translation-lib
 
-go 1.14
+go 1.13
 
 require (
 	github.com/stretchr/testify v1.4.0

diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/kube-aggregator
 
-go 1.14
+go 1.13
 
 require (
 	github.com/davecgh/go-spew v1.1.1

diff --git a/staging/src/k8s.io/kube-controller-manager/go.mod b/staging/src/k8s.io/kube-controller-manager/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/kube-controller-manager
 
-go 1.14
+go 1.13
 
 require (
 	k8s.io/apimachinery v0.0.0

diff --git a/staging/src/k8s.io/kube-proxy/go.mod b/staging/src/k8s.io/kube-proxy/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/kube-proxy
 
-go 1.14
+go 1.13
 
 require (
 	k8s.io/apimachinery v0.0.0

diff --git a/staging/src/k8s.io/kube-scheduler/go.mod b/staging/src/k8s.io/kube-scheduler/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/kube-scheduler
 
-go 1.14
+go 1.13
 
 require (
 	github.com/google/go-cmp v0.4.0

diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/kubectl
 
-go 1.14
+go 1.13
 
 require (
 	github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd

diff --git a/staging/src/k8s.io/kubelet/go.mod b/staging/src/k8s.io/kubelet/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/kubelet
 
-go 1.14
+go 1.13
 
 require (
 	github.com/gogo/protobuf v1.3.1

diff --git a/staging/src/k8s.io/legacy-cloud-providers/go.mod b/staging/src/k8s.io/legacy-cloud-providers/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/legacy-cloud-providers
 
-go 1.14
+go 1.13
 
 require (
 	cloud.google.com/go v0.51.0

diff --git a/staging/src/k8s.io/metrics/go.mod b/staging/src/k8s.io/metrics/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/metrics
 
-go 1.14
+go 1.13
 
 require (
 	github.com/gogo/protobuf v1.3.1

diff --git a/staging/src/k8s.io/sample-apiserver/go.mod b/staging/src/k8s.io/sample-apiserver/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/sample-apiserver
 
-go 1.14
+go 1.13
 
 require (
 	github.com/go-openapi/spec v0.19.3

diff --git a/staging/src/k8s.io/sample-cli-plugin/go.mod b/staging/src/k8s.io/sample-cli-plugin/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/sample-cli-plugin
 
-go 1.14
+go 1.13
 
 require (
 	github.com/spf13/cobra v1.0.0

diff --git a/staging/src/k8s.io/sample-controller/go.mod b/staging/src/k8s.io/sample-controller/go.mod
@@ -2,7 +2,7 @@
 
 module k8s.io/sample-controller
 
-go 1.14
+go 1.13
 
 require (
 	k8s.io/api v0.0.0