Skip to content

Commit

Permalink
Merge pull request #6857 from justinsb/k8s_1_13_5
Browse files Browse the repository at this point in the history 
Update kubernetes dependencies to k8s 1.13.5
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored May 6, 2019
2 parents 36656d6 + 6adc608 commit dbae685
Show file tree
Hide file tree
Showing 1,666 changed files with 45,996 additions and 49,465 deletions.
233 changes: 126 additions & 107 deletions Gopkg.lock
View file

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions Gopkg.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ required = [
"k8s.io/code-generator/cmd/defaulter-gen",

# Needed for docs generation
"k8s.io/code-generator/cmd/openapi-gen",
"k8s.io/kube-openapi/cmd/openapi-gen",
"github.com/kubernetes-incubator/apiserver-builder/cmd/apiserver-boot",
"github.com/kubernetes-incubator/apiserver-builder/cmd/apiregister-gen",
"github.com/kubernetes-incubator/reference-docs/gen-apidocs",
Expand Down Expand Up @@ -49,34 +49,37 @@ required = [
# Core kubernetes components
[[override]]
name = "k8s.io/code-generator"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.5"
[[override]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.5"
[[override]]
name = "k8s.io/api"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.5"
[[override]]
name = "k8s.io/gengo"
revision = "51747d6e00da1fc578d5a333a93bb2abcbce7a95" # version specified in 1.13.5
[[override]]
name = "k8s.io/utils"
revision = "1bd4f387aa67de2eec07a362c10bc8bd7fe74237" # Latest
revision = "66066c83e385e385ccc3c964b44fd7dcd413d0ed" # version specified in 1.13.5
[[override]]
name = "k8s.io/kube-openapi"
revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803" # version specified in 1.12.3
revision = "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" # version specified in 1.13.5
[[override]]
name = "k8s.io/client-go"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.5"
[[override]]
name = "k8s.io/apiserver"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.5"
[[override]]
name = "k8s.io/metrics"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.5"
[[override]]
name = "k8s.io/apiextensions-apiserver"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.5"
[[override]]
name = "k8s.io/kubernetes"
version = "v1.12.3"
version = "v1.13.5"

# Needed for docs generation
[[override]]
Expand All @@ -88,9 +91,6 @@ required = [


# These come from godeps.json in kubernetes
[[override]]
name = "k8s.io/gengo"
revision = "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
[[override]]
name = "github.com/hashicorp/hcl"
revision = "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1"
Expand Down Expand Up @@ -241,7 +241,7 @@ required = [
revision = "d6e3b3328b783f23731bc4d058875b0371ff8109"
[[override]]
name = "github.com/Azure/go-autorest"
revision = "bca49d5b51a50dc5bb17bbf6204c711c6dbded06"
revision = "ea233b6412b0421a65dc6160e16c893364664a95"
[[override]]
name = "golang.org/x/net"
revision = "1c05540f6879653db88113bc4a2b70aec4bd491f"
Expand Down Expand Up @@ -378,7 +378,7 @@ required = [
revision = "593d64559f7600f29581a3ee42177f5dbded27a9"
[[override]]
name = "github.com/evanphx/json-patch"
revision = "36442dbdb585210f8d5a1b45e67aa323c197d5c4"
revision = "5858425f75500d40c52783dce87d085a483ce135"
[[override]]
name = "github.com/pmezard/go-difflib"
revision = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ go_library(
"//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
"//vendor/k8s.io/client-go/util/homedir:go_default_library",
"//vendor/k8s.io/helm/pkg/strvals:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/kubectl/cmd/templates:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util/editor:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/kubectl/util/i18n:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/kubectl/util/templates:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/completion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (

"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

const boilerPlate = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/util/pkg/text"
"k8s.io/kops/util/pkg/vfs"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

type CreateOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/create_cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
"k8s.io/kops/upup/pkg/fi/cloudup/gce"
"k8s.io/kops/upup/pkg/fi/utils"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/create_ig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import (
"k8s.io/kops/pkg/kopscodecs"
"k8s.io/kops/pkg/try"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

type CreateInstanceGroupOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/create_secret.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/create_secret_dockerconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/create_secret_encryptionconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/create_secret_keypair.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/create_secret_keypair_ca.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"k8s.io/kops/pkg/pki"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/utils"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/create_secret_sshpublickey.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (

"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/create_secret_weave_encryptionconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (
"k8s.io/kops/pkg/sshcredentials"
"k8s.io/kops/util/pkg/text"
"k8s.io/kops/util/pkg/vfs"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

type DeleteOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/delete_cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

type DeleteClusterOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/delete_instancegroup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"k8s.io/kops/pkg/instancegroups"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/util/pkg/ui"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/delete_secret.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/describe.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package main

import (
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/describe_secrets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/edit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/edit_cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import (
"k8s.io/kops/pkg/kopscodecs"
"k8s.io/kops/pkg/try"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
util_editor "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

type EditClusterOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/edit_instancegroup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (
"k8s.io/kops/pkg/kopscodecs"
"k8s.io/kops/pkg/try"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/export.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/export_kubecfg.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"k8s.io/kops/pkg/commands"
"k8s.io/kops/pkg/kubeconfig"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/get.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"k8s.io/kops/cmd/kops/util"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/kopscodecs"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/get_cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/get_instancegroups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/formatter"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/get_secrets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"k8s.io/kops/pkg/sshcredentials"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

// SecretTypeSSHPublicKey is set in a KeysetItem.Type for an SSH public keypair
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/import.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package main

import (
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/replace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"k8s.io/kops/pkg/kopscodecs"
"k8s.io/kops/util/pkg/text"
"k8s.io/kops/util/pkg/vfs"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/rollingupdatecluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ import (
"k8s.io/kops/pkg/pretty"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/templates"
)

var (
Expand Down
Loading

0 comments on commit dbae685

Please sign in to comment.