github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

update scripts for new kube-aggregator location

Browse Source
This commit is contained in:
deads2k 2017-02-14 10:04:28 -05:00
parent f44c288a21
commit 1d40c3ff76
14 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/BUILD
View File

@ -65,7 +65,7 @@ DOCKERIZED_BINARIES = {
}, },
"kube-aggregator": { "kube-aggregator": {
"base": ":busybox-libc", "base": ":busybox-libc",
"target": "//cmd/kube-aggregator:kube-aggregator", "target": "//vendor/k8s.io/kube-aggregator:kube-aggregator",
}, },
"kube-proxy": { "kube-proxy": {
"base": ":busybox-net", "base": ":busybox-net",

2
build/release-tars/BUILD
View File

@ -69,7 +69,7 @@ NODE_TARGETS = [
# since we include them in the actual build rule. # since we include them in the actual build rule.
SERVER_TARGETS = [ SERVER_TARGETS = [
"//cmd/hyperkube", "//cmd/hyperkube",
"//cmd/kube-aggregator", "//vendor/k8s.io/kube-aggregator",
"//cmd/kube-apiserver", "//cmd/kube-apiserver",
"//cmd/kube-controller-manager", "//cmd/kube-controller-manager",
"//cmd/kube-discovery", "//cmd/kube-discovery",

3
hack/godep-save.sh
View File

@ -47,6 +47,9 @@ pushd "${KUBE_ROOT}" > /dev/null
if [ ! -e "vendor/k8s.io/apimachinery" ]; then if [ ! -e "vendor/k8s.io/apimachinery" ]; then
ln -s ../../staging/src/k8s.io/apimachinery vendor/k8s.io/apimachinery ln -s ../../staging/src/k8s.io/apimachinery vendor/k8s.io/apimachinery
fi fi
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/sample-apiserver" ]; then if [ ! -e "vendor/k8s.io/sample-apiserver" ]; then
ln -s ../../staging/src/k8s.io/sample-apiserver vendor/k8s.io/sample-apiserver ln -s ../../staging/src/k8s.io/sample-apiserver vendor/k8s.io/sample-apiserver
fi fi

2
hack/lib/golang.sh
View File

@ -32,7 +32,7 @@ kube::golang::server_targets() {
cmd/kubeadm cmd/kubeadm
cmd/hyperkube cmd/hyperkube
cmd/kube-discovery cmd/kube-discovery
cmd/kube-aggregator vendor/k8s.io/kube-aggregator
plugin/cmd/kube-scheduler plugin/cmd/kube-scheduler
) )
echo "${targets[@]}" echo "${targets[@]}"

2
hack/local-up-cluster.sh
View File

@ -144,7 +144,7 @@ do
done done
if [ "x$GO_OUT" == "x" ]; then if [ "x$GO_OUT" == "x" ]; then
make -C "${KUBE_ROOT}" WHAT="cmd/kubectl cmd/hyperkube cmd/kube-aggregator" make -C "${KUBE_ROOT}" WHAT="cmd/kubectl cmd/hyperkube vendor/k8s.io/kube-aggregator"
else else
echo "skipped the build." echo "skipped the build."
fi fi

8
hack/local-up-kube-aggregator.sh
View File

@ -66,7 +66,7 @@ function start_kube-aggregator {
# make sure the resources we're about to create don't exist # make sure the resources we're about to create don't exist
kubectl_core -n kube-public delete secret auth-proxy-client serving-etcd serving-kube-aggregator kube-aggregator-etcd > /dev/null 2>&1 || true kubectl_core -n kube-public delete secret auth-proxy-client serving-etcd serving-kube-aggregator kube-aggregator-etcd > /dev/null 2>&1 || true
kubectl_core -n kube-public delete configmap etcd-ca kube-aggregator-ca client-ca request-header-ca > /dev/null 2>&1 || true kubectl_core -n kube-public delete configmap etcd-ca kube-aggregator-ca client-ca request-header-ca > /dev/null 2>&1 || true
kubectl_core -n kube-public delete -f "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/local-cluster-up" > /dev/null 2>&1 || true kubectl_core -n kube-public delete -f "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/local-cluster-up" > /dev/null 2>&1 || true
sudo_kubectl_core -n kube-public create secret tls auth-proxy-client --cert="${CERT_DIR}/client-auth-proxy.crt" --key="${CERT_DIR}/client-auth-proxy.key" sudo_kubectl_core -n kube-public create secret tls auth-proxy-client --cert="${CERT_DIR}/client-auth-proxy.crt" --key="${CERT_DIR}/client-auth-proxy.key"
sudo_kubectl_core -n kube-public create secret tls serving-etcd --cert="${CERT_DIR}/serving-etcd.crt" --key="${CERT_DIR}/serving-etcd.key" sudo_kubectl_core -n kube-public create secret tls serving-etcd --cert="${CERT_DIR}/serving-etcd.crt" --key="${CERT_DIR}/serving-etcd.key"
@ -77,9 +77,9 @@ function start_kube-aggregator {
kubectl_core -n kube-public create configmap client-ca --from-file="ca.crt=${CERT_DIR}/client-ca.crt" || true kubectl_core -n kube-public create configmap client-ca --from-file="ca.crt=${CERT_DIR}/client-ca.crt" || true
kubectl_core -n kube-public create configmap request-header-ca --from-file="ca.crt=${CERT_DIR}/request-header-ca.crt" || true kubectl_core -n kube-public create configmap request-header-ca --from-file="ca.crt=${CERT_DIR}/request-header-ca.crt" || true
${KUBE_ROOT}/cmd/kube-aggregator/hack/build-image.sh ${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/hack/build-image.sh
kubectl_core -n kube-public create -f "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/local-cluster-up" kubectl_core -n kube-public create -f "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/local-cluster-up"
${sudo} cp "${CERT_DIR}/admin.kubeconfig" "${CERT_DIR}/admin-kube-aggregator.kubeconfig" ${sudo} cp "${CERT_DIR}/admin.kubeconfig" "${CERT_DIR}/admin-kube-aggregator.kubeconfig"
${sudo} chown ${USER} "${CERT_DIR}/admin-kube-aggregator.kubeconfig" ${sudo} chown ${USER} "${CERT_DIR}/admin-kube-aggregator.kubeconfig"
@ -94,7 +94,7 @@ function start_kube-aggregator {
sleep 1 sleep 1
# create the "normal" api services for the core API server # create the "normal" api services for the core API server
${kubectl} --kubeconfig="${CERT_DIR}/admin-kube-aggregator.kubeconfig" create -f "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/core-apiservices" ${kubectl} --kubeconfig="${CERT_DIR}/admin-kube-aggregator.kubeconfig" create -f "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/core-apiservices"
} }
kube::util::test_openssl_installed kube::util::test_openssl_installed

3
hack/make-rules/test.sh
View File

@ -67,6 +67,9 @@ kube::test::find_dirs() {
# run tests for apimachinery # run tests for apimachinery
find ./staging/src/k8s.io/apimachinery -name '*_test.go' \ find ./staging/src/k8s.io/apimachinery -name '*_test.go' \
-name '*_test.go' -print0 | xargs -0n1 dirname | sed 's|^\./staging/src/|./vendor/|' | LC_ALL=C sort -u -name '*_test.go' -print0 | xargs -0n1 dirname | sed 's|^\./staging/src/|./vendor/|' | LC_ALL=C sort -u
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
) )
} }

2
hack/update-codegen.sh
View File

@ -101,4 +101,4 @@ ${informergen} \
# You may add additional calls of code generators like set-gen above. # You may add additional calls of code generators like set-gen above.
# call generation on sub-project for now # call generation on sub-project for now
cmd/kube-aggregator/hack/update-codegen.sh vendor/k8s.io/kube-aggregator/hack/update-codegen.sh

2
hack/verify-codegen.sh
View File

@ -24,7 +24,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
# call verify on sub-project for now # call verify on sub-project for now
cmd/kube-aggregator/hack/verify-codegen.sh vendor/k8s.io/kube-aggregator/hack/verify-codegen.sh
"${KUBE_ROOT}/hack/update-codegen.sh" --verify-only "${KUBE_ROOT}/hack/update-codegen.sh" --verify-only

7
hack/verify-staging-imports.sh
View File

@ -51,9 +51,10 @@ function print_forbidden_imports () {
RC=0 RC=0
print_forbidden_imports apimachinery k8s.io/ || RC=1 print_forbidden_imports apimachinery k8s.io/ || RC=1
print_forbidden_imports apiserver k8s.io/kubernetes || RC=1 print_forbidden_imports apiserver k8s.io/kubernetes k8s.io/sample-apiserver k8s.io/kube-aggregator || RC=1
print_forbidden_imports client-go k8s.io/kubernetes k8s.io/apiserver || RC=1 print_forbidden_imports client-go k8s.io/kubernetes k8s.io/apiserver k8s.io/sample-apiserver k8s.io/kube-aggregator || RC=1
print_forbidden_imports sample-apiserver k8s.io/kubernetes || RC=1 print_forbidden_imports kube-aggregator k8s.io/kubernetes k8s.io/sample-apiserver || RC=1
print_forbidden_imports sample-apiserver k8s.io/kubernetes k8s.io/kube-aggregator || RC=1
if [ ${RC} != 0 ]; then if [ ${RC} != 0 ]; then
exit ${RC} exit ${RC}
fi fi

6
staging/src/k8s.io/kube-aggregator/hack/build-image.sh
View File

@ -20,9 +20,9 @@ source "${KUBE_ROOT}/hack/lib/util.sh"
# Register function to be called on EXIT to remove generated binary. # Register function to be called on EXIT to remove generated binary.
function cleanup { function cleanup {
rm "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/simple-image/kube-aggregator" rm "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/simple-image/kube-aggregator"
} }
trap cleanup EXIT trap cleanup EXIT
cp -v ${KUBE_ROOT}/_output/local/bin/linux/amd64/kube-aggregator "${KUBE_ROOT}/cmd/kube-aggregator/artifacts/simple-image/kube-aggregator" cp -v ${KUBE_ROOT}/_output/local/bin/linux/amd64/kube-aggregator "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/simple-image/kube-aggregator"
docker build -t kube-aggregator:latest ${KUBE_ROOT}/cmd/kube-aggregator/artifacts/simple-image docker build -t kube-aggregator:latest ${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/artifacts/simple-image

31
staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
View File

@ -18,7 +18,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/.. APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
@ -43,26 +43,26 @@ echo "Building client-gen"
CLIENTGEN="${PWD}/client-gen-binary" CLIENTGEN="${PWD}/client-gen-binary"
go build -o "${CLIENTGEN}" ./cmd/libs/go2idl/client-gen go build -o "${CLIENTGEN}" ./cmd/libs/go2idl/client-gen
PREFIX=k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis PREFIX=k8s.io/kube-aggregator/pkg/apis
INPUT_BASE="--input-base ${PREFIX}" INPUT_BASE="--input-base ${PREFIX}"
INPUT_APIS=( INPUT_APIS=(
apiregistration/ apiregistration/
apiregistration/v1alpha1 apiregistration/v1alpha1
) )
INPUT="--input ${INPUT_APIS[@]}" INPUT="--input ${INPUT_APIS[@]}"
CLIENTSET_PATH="--clientset-path k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated" CLIENTSET_PATH="--clientset-path k8s.io/kube-aggregator/pkg/client/clientset_generated"
${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} ${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1alpha1 ${CLIENTSET_PATH} ${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1alpha1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
echo "Building lister-gen" echo "Building lister-gen"
listergen="${PWD}/lister-gen" listergen="${PWD}/lister-gen"
go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen
LISTER_INPUT="--input-dirs k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" LISTER_INPUT="--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1"
LISTER_PATH="--output-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers" LISTER_PATH="--output-package k8s.io/kube-aggregator/pkg/client/listers"
${listergen} ${LISTER_INPUT} ${LISTER_PATH} ${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor
echo "Building informer-gen" echo "Building informer-gen"
@ -70,19 +70,20 @@ informergen="${PWD}/informer-gen"
go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen
${informergen} \ ${informergen} \
--input-dirs k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1 \ --output-base ${KUBE_ROOT}/vendor \
--versioned-clientset-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset \ --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1 \
--internal-clientset-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset \ --versioned-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset \
--listers-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers \ --internal-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset \
--output-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers --listers-package k8s.io/kube-aggregator/pkg/client/listers \
--output-package k8s.io/kube-aggregator/pkg/client/informers
"$@" "$@"
# this is a temporary hack until we manage to update codegen to accept a scheme instead of hardcoding it # this is a temporary hack until we manage to update codegen to accept a scheme instead of hardcoding it
echo "rewriting imports" echo "rewriting imports"
grep -R -H "\"k8s.io/kubernetes/pkg" "${KUBE_ROOT}/cmd/kube-aggregator/pkg/client" | cut -d: -f1 | sort | uniq | \ grep -R -H "\"k8s.io/kubernetes/pkg" "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/pkg/client" | cut -d: -f1 | sort | uniq | \
grep "\.go" | \ grep "\.go" | \
xargs ${SED} -i "s|\"k8s.io/kubernetes/pkg|\"k8s.io/client-go/pkg|g" xargs ${SED} -i "s|\"k8s.io/kubernetes/pkg|\"k8s.io/client-go/pkg|g"
echo "running gofmt" echo "running gofmt"
find "${KUBE_ROOT}/cmd/kube-aggregator/pkg/client" -type f -name "*.go" -print0 | xargs -0 gofmt -w find "${KUBE_ROOT}/vendor/k8s.io/kube-aggregator/pkg/client" -type f -name "*.go" -print0 | xargs -0 gofmt -w

2
staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh
View File

@ -18,7 +18,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/.. APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"

1
vendor/k8s.io/kube-aggregator generated vendored Symbolic link
View File

@ -0,0 +1 @@
../../staging/src/k8s.io/kube-aggregator