github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

k8s.io/code-generator: hide gen test output from go tools 

The underscore in front of _test makes the go tools (including godep) to
ignore those packages by default. We do not want to create dependencies
to client-go and friend through the _test output.
pull/6/head
Dr. Stefan Schimanski 2017-09-19 11:09:24 +02:00
parent 8ca1d9f19b
commit a3f8c9b5e1
8 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hack/.golint_failures
View File

@ -759,20 +759,6 @@ staging/src/k8s.io/code-generator/cmd/conversion-gen/generators
staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf
staging/src/k8s.io/code-generator/cmd/informer-gen/generators
staging/src/k8s.io/code-generator/cmd/lister-gen/generators
staging/src/k8s.io/code-generator/test/apis/testgroup
staging/src/k8s.io/code-generator/test/apis/testgroup/v1
staging/src/k8s.io/code-generator/test/clientset/internal
staging/src/k8s.io/code-generator/test/clientset/internal/fake
staging/src/k8s.io/code-generator/test/clientset/internal/scheme
staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion
staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake
staging/src/k8s.io/code-generator/test/clientset/versioned
staging/src/k8s.io/code-generator/test/clientset/versioned/fake
staging/src/k8s.io/code-generator/test/clientset/versioned/scheme
staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1
staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake
staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces
staging/src/k8s.io/code-generator/test/informers/internalversion/internalinterfaces
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/validation

12
hack/staging-import-restrictions.json
View File

@ -16,7 +16,7 @@
{
"baseImportPath": "./vendor/k8s.io/code-generator/",
"ignoredSubTrees": [
"./vendor/k8s.io/code-generator/test"
"./vendor/k8s.io/code-generator/_test"
],
"allowedImports": [
"k8s.io/gengo",
@ -24,16 +24,6 @@
"k8s.io/kube-openapi"
]
},
{
"baseImportPath": "./vendor/k8s.io/code-generator/test/",
"allowedImports": [
"k8s.io/apimachinery",
"k8s.io/client-go",
"k8s.io/gengo",
"k8s.io/code-generator/test",
"k8s.io/kube-openapi"
]
},
{
"baseImportPath": "./vendor/k8s.io/client-go/",
"allowedImports": [

10
staging/src/k8s.io/code-generator/hack/update-codegen.sh
View File

@ -37,10 +37,10 @@ trap cleanup EXIT
function generate_group() {
local GROUP_NAME=$1
local VERSION=$2
local CLIENT_PKG=${SCRIPT_PACKAGE}/test/clientset
local LISTERS_PKG=${SCRIPT_PACKAGE}/test/listers
local INFORMERS_PKG=${SCRIPT_PACKAGE}/test/informers
local APIS_PKG=${SCRIPT_PACKAGE}/test/apis
local CLIENT_PKG=${SCRIPT_PACKAGE}/_test/clientset
local LISTERS_PKG=${SCRIPT_PACKAGE}/_test/listers
local INFORMERS_PKG=${SCRIPT_PACKAGE}/_test/informers
local APIS_PKG=${SCRIPT_PACKAGE}/_test/apis
local INPUT_APIS=(
${GROUP_NAME}/
${GROUP_NAME}/${VERSION}
@ -52,7 +52,7 @@ function generate_group() {
echo "generating clientset for group ${GROUP_NAME} and version ${VERSION} at ${SCRIPT_BASE}/${CLIENT_PKG}"
${clientgen} --clientset-name="internal" --input-base ${APIS_PKG} --input ${INPUT_APIS[@]} --clientset-path ${CLIENT_PKG} --output-base=${SCRIPT_BASE}
${clientgen} --clientset-name="versioned" --input-base ${APIS_PKG} --input ${GROUP_NAME}/${VERSION} --clientset-path ${CLIENT_PKG} --output-base=${SCRIPT_BASE}
echo "Building lister-gen"
go build -o "${listergen}" ${CODEGEN_PKG}/cmd/lister-gen

4
staging/src/k8s.io/code-generator/hack/verify-codegen.sh
View File

@ -21,8 +21,8 @@ set -o pipefail
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
SCRIPT_BASE=${SCRIPT_ROOT}/../..
DIFFROOT="${SCRIPT_ROOT}/test"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/test"
DIFFROOT="${SCRIPT_ROOT}/_test"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/_test"
_tmp="${SCRIPT_ROOT}/_tmp"
cleanup() {

2
staging/src/k8s.io/code-generator/test/apis/testgroup/doc.go
View File

@ -16,4 +16,4 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=testgroup.k8s.io
package testgroup // import "k8s.io/code-generator/test/apis/testgroup"
package testgroup // import "k8s.io/code-generator/_test/apis/testgroup"

4
staging/src/k8s.io/code-generator/test/apis/testgroup/install/install.go
View File

@ -22,8 +22,8 @@ import (
"k8s.io/apimachinery/pkg/apimachinery/announced"
"k8s.io/apimachinery/pkg/apimachinery/registered"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/code-generator/test/apis/testgroup"
"k8s.io/code-generator/test/apis/testgroup/v1"
"k8s.io/code-generator/_test/apis/testgroup"
"k8s.io/code-generator/_test/apis/testgroup/v1"
)
// Install registers the API group and adds types to a scheme

1
staging/src/k8s.io/code-generator/test/apis/testgroup/v1/doc.go
View File

@ -15,6 +15,5 @@ limitations under the License.
*/
// +k8s:deepcopy-gen=package,register
// +k8s:openapi-gen=true
// +groupName=testgroup.k8s.io
package v1

4
staging/src/k8s.io/code-generator/test/apis/testgroup/v1/types.go
View File

@ -23,10 +23,6 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
type TestType struct {
metav1.TypeMeta `json:",inline"`
// ---
// the next tag removes the field from openapi spec. Adding unversioned objectMeta bring in a whole set of
// unversioned objects in the generate file that is not used anywhere other than this test type.
// +k8s:openapi-gen=false
// +optional
metav1.ObjectMeta `json:"metadata,omitempty"`
// +optional