Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sample-{apiserver,controller}: move generated file into pkg/generated #74130

Merged
merged 5 commits into from
Feb 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions staging/src/k8s.io/sample-apiserver/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ filegroup(
"//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/apiserver:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1beta1:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/cmd/server:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1alpha1:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1beta1:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/registry:all-srcs",
],
tags = ["automanaged"],
Expand Down
6 changes: 3 additions & 3 deletions staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-
# k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
# instead of the $GOPATH directly. For normal projects this can be dropped.
"${CODEGEN_PKG}/generate-groups.sh" all \
k8s.io/sample-apiserver/pkg/client k8s.io/sample-apiserver/pkg/apis \
k8s.io/sample-apiserver/pkg/generated k8s.io/sample-apiserver/pkg/apis \
"wardle:v1alpha1,v1beta1" \
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
--go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt

"${CODEGEN_PKG}/generate-internal-groups.sh" "deepcopy,defaulter,conversion" \
k8s.io/sample-apiserver/pkg/client k8s.io/sample-apiserver/pkg/apis k8s.io/sample-apiserver/pkg/apis \
k8s.io/sample-apiserver/pkg/generated k8s.io/sample-apiserver/pkg/apis k8s.io/sample-apiserver/pkg/apis \
"wardle:v1alpha1,v1beta1" \
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
--go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"

# To use your own boilerplate text use:
# To use your own boilerplate text append:
# --go-header-file "${SCRIPT_ROOT}/hack/custom-boilerplate.go.txt"
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ go_library(
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1alpha1:go_default_library",
],
)

Expand All @@ -35,8 +35,8 @@ go_test(
"//staging/src/k8s.io/client-go/testing:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:go_default_library",
],
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"k8s.io/apiserver/pkg/admission"
"k8s.io/sample-apiserver/pkg/admission/wardleinitializer"
"k8s.io/sample-apiserver/pkg/apis/wardle"
informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions"
listers "k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1"
informers "k8s.io/sample-apiserver/pkg/generated/informers/externalversions"
listers "k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1alpha1"
)

// Register registers a plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"k8s.io/sample-apiserver/pkg/admission/plugin/banflunder"
"k8s.io/sample-apiserver/pkg/admission/wardleinitializer"
wardle "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
"k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake"
informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions"
"k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake"
informers "k8s.io/sample-apiserver/pkg/generated/informers/externalversions"
)

// TestBanfluderAdmissionPlugin tests various test cases against
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ go_library(
importpath = "k8s.io/sample-apiserver/pkg/admission/wardleinitializer",
deps = [
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:go_default_library",
],
)

Expand All @@ -26,8 +26,8 @@ go_test(
embed = [":go_default_library"],
deps = [
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:go_default_library",
],
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package wardleinitializer

import (
"k8s.io/apiserver/pkg/admission"
informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions"
informers "k8s.io/sample-apiserver/pkg/generated/informers/externalversions"
)

// WantsInternalWardleInformerFactory defines a function which sets InformerFactory for admission plugins that need it
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package wardleinitializer

import (
"k8s.io/apiserver/pkg/admission"
informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions"
informers "k8s.io/sample-apiserver/pkg/generated/informers/externalversions"
)

type pluginInitializer struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"k8s.io/apiserver/pkg/admission"
"k8s.io/sample-apiserver/pkg/admission/wardleinitializer"
"k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake"
informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions"
"k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake"
informers "k8s.io/sample-apiserver/pkg/generated/informers/externalversions"
)

// TestWantsInternalWardleInformerFactory ensures that the informer factory is injected
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions staging/src/k8s.io/sample-apiserver/pkg/cmd/server/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ go_library(
"//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/apiserver:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
],
)
Expand Down
4 changes: 2 additions & 2 deletions staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"k8s.io/sample-apiserver/pkg/admission/wardleinitializer"
"k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
"k8s.io/sample-apiserver/pkg/apiserver"
clientset "k8s.io/sample-apiserver/pkg/client/clientset/versioned"
informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions"
clientset "k8s.io/sample-apiserver/pkg/generated/clientset/versioned"
informers "k8s.io/sample-apiserver/pkg/generated/informers/externalversions"
)

const defaultEtcdPathPrefix = "/registry/wardle.kubernetes.io"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ go_library(
"clientset.go",
"doc.go",
],
importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned",
importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned",
importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned",
importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned",
visibility = ["//visibility:public"],
deps = [
"//staging/src/k8s.io/client-go/discovery:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1:go_default_library",
],
)

Expand All @@ -29,10 +29,10 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1:all-srcs",
],
tags = ["automanaged"],
visibility = ["//visibility:public"],
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ go_library(
"doc.go",
"register.go",
],
importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake",
importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake",
importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake",
importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake",
visibility = ["//visibility:public"],
deps = [
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
Expand All @@ -22,11 +22,11 @@ go_library(
"//staging/src/k8s.io/client-go/testing:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1/fake:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fake:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/fake:go_default_library",
],
)

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ go_library(
"doc.go",
"register.go",
],
importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme",
importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme",
importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme",
importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme",
visibility = ["//visibility:public"],
deps = [
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ go_library(
"generated_expansion.go",
"wardle_client.go",
],
importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1",
importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1",
importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1",
importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1",
visibility = ["//visibility:public"],
deps = [
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
Expand All @@ -19,7 +19,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme:go_default_library",
],
)

Expand All @@ -34,7 +34,7 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fake:all-srcs",
],
tags = ["automanaged"],
visibility = ["//visibility:public"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ go_library(
"fake_flunder.go",
"fake_wardle_client.go",
],
importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake",
importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake",
importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fake",
importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fake",
visibility = ["//visibility:public"],
deps = [
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
Expand All @@ -20,7 +20,7 @@ go_library(
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/testing:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
],
)

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.