Skip to content
Permalink
Browse files

Merge pull request #81521 from cblecker/automated-cherry-pick-of-#78958-

#79966-#81390-#81489-upstream-release-1.14

Update release-1.14 to go 1.12.9
  • Loading branch information...
k8s-ci-robot committed Aug 16, 2019
2 parents 8d39479 + 73c04ba commit 96fac5cd13a5dc064f7d9f4f23030a6aeface6cc
Showing with 725 additions and 432 deletions.
  1. +1 −1 build/build-image/cross/Dockerfile
  2. +1 −1 build/build-image/cross/VERSION
  3. +3 −3 build/root/WORKSPACE
  4. +1 −1 hack/boilerplate/boilerplate_test.py
  5. +2 −2 pkg/cloudprovider/providers/vsphere/vclib/connection_test.go
  6. +14 −9 staging/src/k8s.io/api/admission/v1beta1/generated.pb.go
  7. +12 −7 staging/src/k8s.io/api/admissionregistration/v1beta1/generated.pb.go
  8. +15 −9 staging/src/k8s.io/api/apps/v1/generated.pb.go
  9. +16 −10 staging/src/k8s.io/api/apps/v1beta1/generated.pb.go
  10. +16 −10 staging/src/k8s.io/api/apps/v1beta2/generated.pb.go
  11. +11 −6 staging/src/k8s.io/api/auditregistration/v1alpha1/generated.pb.go
  12. +13 −8 staging/src/k8s.io/api/authentication/v1/generated.pb.go
  13. +12 −7 staging/src/k8s.io/api/authentication/v1beta1/generated.pb.go
  14. +12 −7 staging/src/k8s.io/api/authorization/v1/generated.pb.go
  15. +12 −7 staging/src/k8s.io/api/authorization/v1beta1/generated.pb.go
  16. +15 −9 staging/src/k8s.io/api/autoscaling/v1/generated.pb.go
  17. +15 −9 staging/src/k8s.io/api/autoscaling/v2beta1/generated.pb.go
  18. +15 −9 staging/src/k8s.io/api/autoscaling/v2beta2/generated.pb.go
  19. +14 −8 staging/src/k8s.io/api/batch/v1/generated.pb.go
  20. +14 −8 staging/src/k8s.io/api/batch/v1beta1/generated.pb.go
  21. +14 −8 staging/src/k8s.io/api/batch/v2alpha1/generated.pb.go
  22. +12 −7 staging/src/k8s.io/api/certificates/v1beta1/generated.pb.go
  23. +12 −7 staging/src/k8s.io/api/coordination/v1/generated.pb.go
  24. +12 −7 staging/src/k8s.io/api/coordination/v1beta1/generated.pb.go
  25. +18 −11 staging/src/k8s.io/api/core/v1/generated.pb.go
  26. +12 −7 staging/src/k8s.io/api/events/v1beta1/generated.pb.go
  27. +16 −10 staging/src/k8s.io/api/extensions/v1beta1/generated.pb.go
  28. +12 −7 staging/src/k8s.io/api/imagepolicy/v1alpha1/generated.pb.go
  29. +14 −9 staging/src/k8s.io/api/networking/v1/generated.pb.go
  30. +11 −6 staging/src/k8s.io/api/networking/v1beta1/generated.pb.go
  31. +16 −10 staging/src/k8s.io/api/policy/v1beta1/generated.pb.go
  32. +12 −7 staging/src/k8s.io/api/rbac/v1/generated.pb.go
  33. +12 −7 staging/src/k8s.io/api/rbac/v1alpha1/generated.pb.go
  34. +12 −7 staging/src/k8s.io/api/rbac/v1beta1/generated.pb.go
  35. +11 −6 staging/src/k8s.io/api/scheduling/v1/generated.pb.go
  36. +11 −6 staging/src/k8s.io/api/scheduling/v1alpha1/generated.pb.go
  37. +11 −6 staging/src/k8s.io/api/scheduling/v1beta1/generated.pb.go
  38. +12 −7 staging/src/k8s.io/api/settings/v1alpha1/generated.pb.go
  39. +13 −8 staging/src/k8s.io/api/storage/v1/generated.pb.go
  40. +12 −7 staging/src/k8s.io/api/storage/v1alpha1/generated.pb.go
  41. +13 −8 staging/src/k8s.io/api/storage/v1beta1/generated.pb.go
  42. +16 −10 staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.pb.go
  43. +7 −3 staging/src/k8s.io/apimachinery/pkg/api/resource/generated.pb.go
  44. +16 −10 staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
  45. +11 −6 staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.pb.go
  46. +13 −8 staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/generated.pb.go
  47. +11 −6 staging/src/k8s.io/apimachinery/pkg/runtime/generated.pb.go
  48. +7 −3 staging/src/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go
  49. +8 −4 staging/src/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go
  50. +18 −11 staging/src/k8s.io/apiserver/pkg/apis/audit/v1/generated.pb.go
  51. +18 −11 staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/generated.pb.go
  52. +18 −11 staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1/generated.pb.go
  53. +13 −8 staging/src/k8s.io/apiserver/pkg/apis/example/v1/generated.pb.go
  54. +11 −6 staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/generated.pb.go
  55. +11 −6 staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/generated.pb.go
  56. +12 −7 staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/generated.pb.go
  57. +12 −7 staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2/generated.pb.go
  58. +12 −7 staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/generated.pb.go
  59. +14 −9 staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/generated.pb.go
  60. +14 −9 staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/generated.pb.go
  61. +1 −1 test/images/Makefile
@@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about.

FROM golang:1.12.5
FROM golang:1.12.9

ENV GOARM 7
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
@@ -1 +1 @@
v1.12.5-1
v1.12.9-1
@@ -21,16 +21,16 @@ http_archive(

http_archive(
name = "io_bazel_rules_go",
sha256 = "87a089eabf919de29eb4711daa52ffbc4b22b2c045949c20503357a3cadf1037",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.5/rules_go-0.17.5.tar.gz"),
sha256 = "f635b285d7e902ac7327637edbba98a4f110e8202c8f4fb49d2f6ecd837f704a",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.18.9/rules_go-0.18.9.tar.gz"),
)

load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

go_rules_dependencies()

go_register_toolchains(
go_version = "1.12.5",
go_version = "1.12.9",
)

http_archive(
@@ -16,7 +16,7 @@

import boilerplate
import unittest
import StringIO
from io import StringIO
import os
import sys

@@ -159,7 +159,7 @@ func TestWithValidThumbprint(t *testing.T) {
func TestWithInvalidCaCertPath(t *testing.T) {
connection := &vclib.VSphereConnection{
Hostname: "should-not-matter",
Port: "should-not-matter",
Port: "27015", // doesn't matter, but has to be a valid port
CACert: "invalid-path",
}

@@ -172,7 +172,7 @@ func TestWithInvalidCaCertPath(t *testing.T) {
func TestInvalidCaCert(t *testing.T) {
connection := &vclib.VSphereConnection{
Hostname: "should-not-matter",
Port: "should-not-matter",
Port: "27015", // doesn't matter, but has to be a valid port
CACert: fixtures.InvalidCertPath,
}

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

0 comments on commit 96fac5c

Please sign in to comment.
You can’t perform that action at this time.