Permalink
Browse files

merging 1.7 latest commits

  • Loading branch information...
khenidak committed May 3, 2017
2 parents d457b99 + 03400bb commit b54c268c04dd15fb55998bca159362975e9cde16
Showing 4,475 changed files with 333,049 additions and 140,690 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
View
@@ -10,7 +10,11 @@
"./examples"
],
"SkippedPaths": [
"^_.*"
"^_.*",
"^staging.*",
"_vendor"
],
"AddSourcesRules": true
"AddSourcesRules": true,
"VendorMultipleBuildFiles": true,
"K8sOpenAPIGen": true
}
View
@@ -110,6 +110,7 @@ kubernetes.tar.gz
# generated files in any directory
# TODO(thockin): uncomment this when we stop committing the generated files.
#zz_generated.*
zz_generated.openapi.go
# make-related metadata
/.make/
View
@@ -4,16 +4,33 @@ licenses(["notice"])
load("@io_bazel_rules_go//go:def.bzl", "go_prefix")
load("@io_kubernetes_build//defs:build.bzl", "gcs_upload")
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
go_prefix("k8s.io/kubernetes")
filegroup(
name = "_binary-artifacts-and-hashes",
srcs = [
"//build:client-targets-and-hashes",
"//build:docker-artifacts-and-hashes",
"//build:node-targets-and-hashes",
"//build:server-targets-and-hashes",
"//build/debs:debs-and-hashes",
],
visibility = ["//visibility:private"],
)
gcs_upload(
name = "ci-artifacts",
data = [
"//build/debs",
"//build/release-tars",
":_binary-artifacts-and-hashes",
"//build/release-tars:release-tars-and-hashes",
"//cluster/gce:gcs-release-artifacts-and-hashes",
],
upload_paths = {
"//:_binary-artifacts-and-hashes": "bin/linux/amd64",
"//build/release-tars:release-tars-and-hashes": "",
"//cluster/gce:gcs-release-artifacts-and-hashes": "extra/gce",
},
)
filegroup(
@@ -56,6 +73,6 @@ filegroup(
genrule(
name = "save_git_version",
outs = ["version"],
cmd = "grep ^STABLE_BUILD_SCM_REVISION bazel-out/stable-status.txt | cut -d' ' -f2 >$@",
cmd = "grep ^STABLE_BUILD_SCM_REVISION bazel-out/stable-status.txt | awk '{print $$2}' >$@",
stamp = 1,
)
Oops, something went wrong.

0 comments on commit b54c268

Please sign in to comment.