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.

Sign up for GitHub

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

Jump to bottom

Rename {kube- ->}apiextensions-{-> api}server #46775

Merged
merged 2 commits into from
Jun 6, 2017
Merged

Rename {kube- ->}apiextensions-{-> api}server #46775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33e50da
Rename {kube- ->}apiextensions-{-> api}server
sttts Jun 1, 2017
bb663aa
hack/verify-staging-imports.sh: add apiextensions-apiserver
sttts Jun 1, 2017
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 cmd/kube-apiserver/app/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ go_library(
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/apiserver:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/cmd/server:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/openapi:go_default_library",
Expand All @@ -98,10 +102,6 @@ go_library(
"//vendor/k8s.io/kube-aggregator/pkg/apiserver:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/controllers/autoregister:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/apiserver:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/cmd/server:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/kube-apiserver/app/aggregator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"net/http"
"strings"

apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -37,7 +38,6 @@ import (
aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
apiregistrationclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion"
"k8s.io/kube-aggregator/pkg/controllers/autoregister"
apiextensionsinformers "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion"
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion"
"k8s.io/kubernetes/pkg/master/thirdparty"
Expand Down
6 changes: 3 additions & 3 deletions cmd/kube-apiserver/app/apiextensions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ limitations under the License.
package app

import (
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver"
apiextensionscmd "k8s.io/apiextensions-apiserver/pkg/cmd/server"
genericapiserver "k8s.io/apiserver/pkg/server"
genericoptions "k8s.io/apiserver/pkg/server/options"
"k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1"
apiextensionsapiserver "k8s.io/kube-apiextensions-server/pkg/apiserver"
apiextensionscmd "k8s.io/kube-apiextensions-server/pkg/cmd/server"
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ func New() *Generator {
`k8s.io/apimachinery/pkg/apis/meta/v1`,
`k8s.io/apimachinery/pkg/apis/meta/v1alpha1`,
`k8s.io/apiserver/pkg/apis/example/v1`,
`k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1`,
`k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1`,
`k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1`,
`k8s.io/kubernetes/pkg/api/v1`,
`k8s.io/kubernetes/pkg/apis/policy/v1beta1`,
`k8s.io/kubernetes/pkg/apis/extensions/v1beta1`,
Expand Down
24 changes: 12 additions & 12 deletions hack/.linted_packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,18 @@ plugin/pkg/scheduler
plugin/pkg/scheduler/algorithmprovider
plugin/pkg/scheduler/algorithmprovider/defaults
plugin/pkg/scheduler/api/validation
staging/src/k8s.io/apiextensions-apiserver
staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install
staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation
staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions
staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions
staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1
staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion
staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions
staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion
staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion
staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1
staging/src/k8s.io/apiextensions-apiserver/test/integration
staging/src/k8s.io/apimachinery/pkg/api/equality
staging/src/k8s.io/apimachinery/pkg/api/errors
staging/src/k8s.io/apimachinery/pkg/api/resource
Expand Down Expand Up @@ -436,18 +448,6 @@ staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregis
staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion
staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1
staging/src/k8s.io/kube-aggregator/pkg/controllers
staging/src/k8s.io/kube-apiextensions-server
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation
staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions
staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions
staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1
staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion
staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions
staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion
staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion
staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1
staging/src/k8s.io/kube-apiextensions-server/test/integration
staging/src/k8s.io/metrics/pkg/apis/custom_metrics/install
staging/src/k8s.io/metrics/pkg/apis/metrics/install
staging/src/k8s.io/sample-apiserver
Expand Down
4 changes: 2 additions & 2 deletions hack/godep-save.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ pushd "${KUBE_ROOT}" > /dev/null
if [ ! -e "vendor/k8s.io/kube-aggregator" ]; then
ln -s ../../staging/src/k8s.io/kube-aggregator vendor/k8s.io/kube-aggregator
fi
if [ ! -e "vendor/k8s.io/kube-apiextensions-server" ]; then
ln -s ../../staging/src/k8s.io/kube-apiextensions-server vendor/k8s.io/kube-apiextensions-server
if [ ! -e "vendor/k8s.io/apiextensions-apiserver" ]; then
ln -s ../../staging/src/k8s.io/apiextensions-apiserver vendor/k8s.io/apiextensions-apiserver
fi
if [ ! -e "vendor/k8s.io/sample-apiserver" ]; then
ln -s ../../staging/src/k8s.io/sample-apiserver vendor/k8s.io/sample-apiserver
Expand Down
2 changes: 1 addition & 1 deletion hack/lib/golang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kube::golang::server_targets() {
cmd/kubeadm
cmd/hyperkube
vendor/k8s.io/kube-aggregator
vendor/k8s.io/kube-apiextensions-server
vendor/k8s.io/apiextensions-apiserver
plugin/cmd/kube-scheduler
)
echo "${targets[@]}"
Expand Down
2 changes: 1 addition & 1 deletion hack/make-rules/helpers/cache_go_dirs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function kfind() {
# include the "special" vendor directories which are actually part
# of the Kubernetes source tree - generators will use these for
# including certain core API concepts.
find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/kube-apiextensions-server ./vendor/k8s.io/metrics ./vendor/k8s.io/sample-apiserver \
find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/apiextensions-apiserver ./vendor/k8s.io/metrics ./vendor/k8s.io/sample-apiserver \
\( \
-not \( \
\( \
Expand Down
2 changes: 1 addition & 1 deletion hack/make-rules/test-integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ kube::test::find_integration_test_dirs() {
find test/integration/ -name '*_test.go' -print0 \
| xargs -0n1 dirname | sed "s|^|${KUBE_GO_PACKAGE}/|" \
| LC_ALL=C sort -u
find vendor/k8s.io/kube-apiextensions-server/test/integration/ -name '*_test.go' -print0 \
find vendor/k8s.io/apiextensions-apiserver/test/integration/ -name '*_test.go' -print0 \
| xargs -0n1 dirname | sed "s|^|${KUBE_GO_PACKAGE}/|" \
| LC_ALL=C sort -u
)
Expand Down
2 changes: 1 addition & 1 deletion hack/make-rules/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ kube::test::find_dirs() {
find ./staging/src/k8s.io/kube-aggregator -name '*_test.go' \
-name '*_test.go' -print0 | xargs -0n1 dirname | sed 's|^\./staging/src/|./vendor/|' | LC_ALL=C sort -u

find ./staging/src/k8s.io/kube-apiextensions-server -not \( \
find ./staging/src/k8s.io/apiextensions-apiserver -not \( \
\( \
-path '*/test/integration/*' \
\) -prune \
Expand Down
2 changes: 1 addition & 1 deletion hack/update-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@ ${informergen} \
# call generation on sub-project for now
vendor/k8s.io/kube-aggregator/hack/update-codegen.sh
vendor/k8s.io/sample-apiserver/hack/update-codegen.sh
vendor/k8s.io/kube-apiextensions-server/hack/update-codegen.sh
vendor/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
vendor/k8s.io/metrics/hack/update-codegen.sh
2 changes: 1 addition & 1 deletion hack/verify-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ kube::golang::setup_env
# call verify on sub-project for now
vendor/k8s.io/kube-aggregator/hack/verify-codegen.sh
vendor/k8s.io/sample-apiserver/hack/verify-codegen.sh
vendor/k8s.io/kube-apiextensions-server/hack/verify-codegen.sh
vendor/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh
vendor/k8s.io/metrics/hack/verify-codegen.sh

"${KUBE_ROOT}/hack/update-codegen.sh" --verify-only
1 change: 1 addition & 0 deletions hack/verify-staging-imports.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ print_forbidden_imports client-go k8s.io/apimachinery || RC=1
print_forbidden_imports apiserver k8s.io/apimachinery k8s.io/client-go || RC=1
print_forbidden_imports kube-aggregator k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1
print_forbidden_imports sample-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1
print_forbidden_imports apiextensions-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1
if [ ${RC} != 0 ]; then
exit ${RC}
fi
Expand Down
16 changes: 8 additions & 8 deletions pkg/master/thirdparty/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ go_library(
"//pkg/registry/extensions/thirdpartyresourcedata:go_default_library",
"//pkg/registry/extensions/thirdpartyresourcedata/storage:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/apiserver:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/registry/customresource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
Expand All @@ -47,12 +53,6 @@ go_library(
"//vendor/k8s.io/client-go/tools/cache:go_default_library",
"//vendor/k8s.io/client-go/util/workqueue:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/apiserver:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/registry/customresource:go_default_library",
],
)

Expand All @@ -77,12 +77,12 @@ go_test(
deps = [
"//pkg/apis/extensions:go_default_library",
"//pkg/client/listers/extensions/internalversion:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/client-go/tools/cache:go_default_library",
"//vendor/k8s.io/client-go/util/workqueue:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion:go_default_library",
],
)
8 changes: 4 additions & 4 deletions pkg/master/thirdparty/thirdparty.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ import (

"github.com/golang/glog"

"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
apiextensionsserver "k8s.io/apiextensions-apiserver/pkg/apiserver"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion"
"k8s.io/apiextensions-apiserver/pkg/registry/customresource"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand All @@ -41,10 +45,6 @@ import (
serverstorgage "k8s.io/apiserver/pkg/server/storage"
"k8s.io/apiserver/pkg/storage/storagebackend"
discoveryclient "k8s.io/client-go/discovery"
"k8s.io/kube-apiextensions-server/pkg/apis/apiextensions"
apiextensionsserver "k8s.io/kube-apiextensions-server/pkg/apiserver"
apiextensionsclient "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion"
"k8s.io/kube-apiextensions-server/pkg/registry/customresource"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/extensions"
extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest"
Expand Down
6 changes: 3 additions & 3 deletions pkg/master/thirdparty/tprregistration_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ import (

"github.com/golang/glog"

"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
crdinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion"
crdlisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -30,9 +33,6 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/kube-aggregator/pkg/apis/apiregistration"
"k8s.io/kube-apiextensions-server/pkg/apis/apiextensions"
crdinformers "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion"
crdlisters "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion"
"k8s.io/kubernetes/pkg/apis/extensions"
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/extensions/internalversion"
listers "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
Expand Down
4 changes: 2 additions & 2 deletions pkg/master/thirdparty/tprregistration_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import (
"reflect"
"testing"

"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
crdlisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/kube-aggregator/pkg/apis/apiregistration"
"k8s.io/kube-apiextensions-server/pkg/apis/apiextensions"
crdlisters "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion"
"k8s.io/kubernetes/pkg/apis/extensions"
listers "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
)
Expand Down
4 changes: 2 additions & 2 deletions ...rc/k8s.io/kube-apiextensions-server/BUILD → .../src/k8s.io/apiextensions-apiserver/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ load(
)

go_binary(
name = "kube-apiextensions-server",
name = "apiextensions-apiserver",
library = ":go_default_library",
tags = ["automanaged"],
)
Expand All @@ -19,8 +19,8 @@ go_library(
srcs = ["main.go"],
tags = ["automanaged"],
deps = [
"//vendor/k8s.io/apiextensions-apiserver/pkg/cmd/server:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/logs:go_default_library",
"//vendor/k8s.io/kube-apiextensions-server/pkg/cmd/server:go_default_library",
],
)
2 changes: 1 addition & 1 deletion ...e-apiextensions-server/Godeps/Godeps.json → ...piextensions-apiserver/Godeps/Godeps.json
View file
Open in desktop

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

0 ...c/k8s.io/kube-apiextensions-server/OWNERS → ...src/k8s.io/apiextensions-apiserver/OWNERS
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ts/customresource-01/noxu-apiservice.yaml → ...ts/customresource-01/noxu-apiservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
priority: 500
service:
name: api
namespace: kube-apiextensions
namespace: apiextensions
version: v1alpha1
0 ...resource-01/noxu-resource-definition.yaml → ...resource-01/noxu-resource-definition.yaml
View file
Open in desktop
File renamed without changes.
0 ...ver/artifacts/customresource-01/noxu.yaml → ...ver/artifacts/customresource-01/noxu.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...-server/artifacts/example/apiservice.yaml → ...iserver/artifacts/example/apiservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
priority: 100
service:
name: api
namespace: kube-apiextensions
namespace: apiextensions
version: v1alpha1
2 changes: 1 addition & 1 deletion ...ver/artifacts/example/auth-delegator.yaml → ...ver/artifacts/example/auth-delegator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ subjects:
- apiVersion: v1
kind: ServiceAccount
name: apiserver
namespace: kube-apiextensions
namespace: apiextensions
2 changes: 1 addition & 1 deletion ...server/artifacts/example/auth-reader.yaml → ...server/artifacts/example/auth-reader.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ subjects:
- apiVersion: v1
kind: ServiceAccount
name: apiserver
namespace: kube-apiextensions
namespace: apiextensions
4 changes: 2 additions & 2 deletions ...tensions-server/artifacts/example/rc.yaml → ...sions-apiserver/artifacts/example/rc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: ReplicationController
metadata:
name: apiextensions-server
namespace: kube-apiextensions
namespace: apiextensions
labels:
apiserver: "true"
spec:
Expand All @@ -17,7 +17,7 @@ spec:
serviceAccountName: apiserver
containers:
- name: apiextensions-server
image: kube-apiextensions-server:latest
image: apiextensions-apiserver:latest
imagePullPolicy: Never
args:
- "--etcd-servers=http://localhost:2379"
Expand Down
2 changes: 1 addition & 1 deletion ...tensions-server/artifacts/example/sa.yaml → ...sions-apiserver/artifacts/example/sa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ kind: ServiceAccount
apiVersion: v1
metadata:
name: apiserver
namespace: kube-apiextensions
namespace: apiextensions
2 changes: 1 addition & 1 deletion ...ons-server/artifacts/example/service.yaml → ...-apiserver/artifacts/example/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: api
namespace: kube-apiextensions
namespace: apiextensions
spec:
ports:
- port: 443
Expand Down
4 changes: 2 additions & 2 deletions ...-server/artifacts/simple-image/Dockerfile → ...iserver/artifacts/simple-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
# limitations under the License.

FROM fedora
ADD kube-apiextensions-server /
ENTRYPOINT ["/kube-apiextensions-server"]
ADD apiextensions-apiserver /
ENTRYPOINT ["/apiextensions-apiserver"]
8 changes: 4 additions & 4 deletions ...-apiextensions-server/hack/build-image.sh → ...iextensions-apiserver/hack/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ source "${KUBE_ROOT}/hack/lib/util.sh"

# Register function to be called on EXIT to remove generated binary.
function cleanup {
rm "${KUBE_ROOT}/vendor/k8s.io/kube-apiextensions-server/artifacts/simple-image/kube-apiextensions-server"
rm "${KUBE_ROOT}/vendor/k8s.io/apiextensions-apiserver/artifacts/simple-image/apiextensions-apiserver"
}
trap cleanup EXIT

pushd "${KUBE_ROOT}/vendor/k8s.io/kube-apiextensions-server"
cp -v ../../../../_output/local/bin/linux/amd64/kube-apiextensions-server ./artifacts/simple-image/kube-apiextensions-server
docker build -t kube-apiextensions-server:latest ./artifacts/simple-image
pushd "${KUBE_ROOT}/vendor/k8s.io/apiextensions-apiserver"
cp -v ../../../../_output/local/bin/linux/amd64/apiextensions-apiserver ./artifacts/simple-image/apiextensions-apiserver
docker build -t apiextensions-apiserver:latest ./artifacts/simple-image
popd