kubectl: move translated data into kubectl

pull/58/head
Sean Sullivan 2018-10-11 16:03:57 -07:00
parent 688550b2d3
commit b7f8369da2
8 changed files with 28 additions and 4 deletions

View File

@ -11,6 +11,7 @@ generated.proto
pkg/client/clientset_generated pkg/client/clientset_generated
pkg/client/informers/informers_generated/ pkg/client/informers/informers_generated/
pkg/generated pkg/generated
pkg/kubectl/generated
swagger swagger
test/e2e/generated test/e2e/generated
third_party/ third_party/

View File

@ -147,7 +147,7 @@ def file_extension(filename):
skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git', 'cluster/env.sh', skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git', 'cluster/env.sh',
"vendor", "test/e2e/generated/bindata.go", "hack/boilerplate/test", "vendor", "test/e2e/generated/bindata.go", "hack/boilerplate/test",
"pkg/generated/bindata.go"] "pkg/kubectl/generated/bindata.go"]
# list all the files contain 'DO NOT EDIT', but are not generated # list all the files contain 'DO NOT EDIT', but are not generated
skipped_ungenerated_files = ['hack/build-ui.sh', 'hack/lib/swagger.sh', skipped_ungenerated_files = ['hack/build-ui.sh', 'hack/lib/swagger.sh',

View File

@ -64,7 +64,7 @@ fi
rm -f "${BINDATA_OUTPUT}.tmp" rm -f "${BINDATA_OUTPUT}.tmp"
# These are files for runtime code # These are files for runtime code
BINDATA_OUTPUT="pkg/generated/bindata.go" BINDATA_OUTPUT="pkg/kubectl/generated/bindata.go"
# IMPORTANT: if you make any changes to these arguments, you must also update # IMPORTANT: if you make any changes to these arguments, you must also update
# pkg/generated/BUILD and/or build/bindata.bzl. # pkg/generated/BUILD and/or build/bindata.bzl.
go-bindata -nometadata -nocompress -o "${BINDATA_OUTPUT}.tmp" -pkg generated \ go-bindata -nometadata -nocompress -o "${BINDATA_OUTPUT}.tmp" -pkg generated \

View File

@ -118,6 +118,7 @@ filegroup(
"//pkg/kubectl/describe:all-srcs", "//pkg/kubectl/describe:all-srcs",
"//pkg/kubectl/explain:all-srcs", "//pkg/kubectl/explain:all-srcs",
"//pkg/kubectl/generate:all-srcs", "//pkg/kubectl/generate:all-srcs",
"//pkg/kubectl/generated:all-srcs",
"//pkg/kubectl/metricsutil:all-srcs", "//pkg/kubectl/metricsutil:all-srcs",
"//pkg/kubectl/polymorphichelpers:all-srcs", "//pkg/kubectl/polymorphichelpers:all-srcs",
"//pkg/kubectl/proxy:all-srcs", "//pkg/kubectl/proxy:all-srcs",

View File

@ -0,0 +1,22 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["bindata.go"],
importpath = "k8s.io/kubernetes/pkg/kubectl/generated",
visibility = ["//visibility:public"],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

View File

@ -11,7 +11,7 @@ go_library(
srcs = ["i18n.go"], srcs = ["i18n.go"],
importpath = "k8s.io/kubernetes/pkg/kubectl/util/i18n", importpath = "k8s.io/kubernetes/pkg/kubectl/util/i18n",
deps = [ deps = [
"//pkg/generated:go_default_library", "//pkg/kubectl/generated:go_default_library",
"//vendor/github.com/chai2010/gettext-go/gettext:go_default_library", "//vendor/github.com/chai2010/gettext-go/gettext:go_default_library",
"//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/golang/glog:go_default_library",
], ],

View File

@ -24,7 +24,7 @@ import (
"os" "os"
"strings" "strings"
"k8s.io/kubernetes/pkg/generated" "k8s.io/kubernetes/pkg/kubectl/generated"
"github.com/chai2010/gettext-go/gettext" "github.com/chai2010/gettext-go/gettext"
"github.com/golang/glog" "github.com/golang/glog"