Skip to content

K
k3s
Commit 25eb57ad authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40584 from madhusudancs/federation-kubefed.sh

Automatic merge from submit-queue Use a wrapper script to locate kubefed and kubectl binaries instead of directly constructing their paths. This fixes the e2e failures that is now switched to using kubefed. cc @kubernetes/sig-federation-pr-reviews
parents 63fed780 c1d5c6db
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 141 deletions
cluster/clientbin.sh 0 → 100644
View file @ 25eb57ad
#!/bin/bash
# Copyright 2016 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -o errexit
set -o nounset
set -o pipefail
KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/..}
# Detect the OS name/arch so that we can find our binary
case "$(uname -s)" in
Darwin)
host_os=darwin
;;
Linux)
host_os=linux
;;
*)
echo "Unsupported host OS. Must be Linux or Mac OS X." >&2
exit 1
;;
esac
case "$(uname -m)" in
x86_64*)
host_arch=amd64
;;
i?86_64*)
host_arch=amd64
;;
amd64*)
host_arch=amd64
;;
arm*)
host_arch=arm
;;
i?86*)
host_arch=386
;;
s390x*)
host_arch=s390x
;;
ppc64le*)
host_arch=ppc64le
;;
*)
echo "Unsupported host arch. Must be x86_64, 386, arm, s390x or ppc64le." >&2
exit 1
;;
esac
# Get the absolute path of the directory component of a file, i.e. the
# absolute path of the dirname of $1.
get_absolute_dirname() {
echo "$(cd "$(dirname "$1")" && pwd)"
}
function get_bin() {
bin="${1:-}"
srcdir="${2:-}"
if [[ "${bin}" == "" ]]; then
echo "Binary name is required"
exit 1
fi
if [[ "${srcdir}" == "" ]]; then
echo "Source directory path is required"
exit 1
fi
locations=(
"${KUBE_ROOT}/_output/bin/${bin}"
"${KUBE_ROOT}/_output/dockerized/bin/${host_os}/${host_arch}/${bin}"
"${KUBE_ROOT}/_output/local/bin/${host_os}/${host_arch}/${bin}"
"${KUBE_ROOT}/bazel-bin/${srcdir}/${bin}"
"${KUBE_ROOT}/platforms/${host_os}/${host_arch}/${bin}"
)
echo $( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )
}
function print_error() {
{
echo "It looks as if you don't have a compiled ${1:-} binary"
echo
echo "If you are running from a clone of the git repo, please run"
echo "'./build/run.sh make cross'. Note that this requires having"
echo "Docker installed."
echo
echo "If you are running from a binary release tarball, something is wrong. "
echo "Look at http://kubernetes.io/ for information on how to contact the "
echo "development team for help."
} >&2
}
cluster/kubeadm.sh
View file @ 25eb57ad
...@@ -20,79 +20,15 @@ set -o pipefail ...@@ -20,79 +20,15 @@ set -o pipefail
KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/..} KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/..}
source "${KUBE_ROOT}/cluster/kube-util.sh" source "${KUBE_ROOT}/cluster/kube-util.sh"
source "${KUBE_ROOT}/cluster/clientbin.sh"
# Get the absolute path of the directory component of a file, i.e. the
# absolute path of the dirname of $1.
get_absolute_dirname() {
echo "$(cd "$(dirname "$1")" && pwd)"
}
# Detect the OS name/arch so that we can find our binary
case "$(uname -s)" in
Darwin)
host_os=darwin
;;
Linux)
host_os=linux
;;
*)
echo "Unsupported host OS. Must be Linux or Mac OS X." >&2
exit 1
;;
esac
case "$(uname -m)" in
x86_64*)
host_arch=amd64
;;
i?86_64*)
host_arch=amd64
;;
amd64*)
host_arch=amd64
;;
arm*)
host_arch=arm
;;
i?86*)
host_arch=386
;;
s390x*)
host_arch=s390x
;;
ppc64le*)
host_arch=ppc64le
;;
*)
echo "Unsupported host arch. Must be x86_64, 386, arm, s390x or ppc64le." >&2
exit 1
;;
esac
# If KUBEADM_PATH isn't set, gather up the list of likely places and use ls # If KUBEADM_PATH isn't set, gather up the list of likely places and use ls
# to find the latest one. # to find the latest one.
if [[ -z "${KUBEADM_PATH:-}" ]]; then if [[ -z "${KUBEADM_PATH:-}" ]]; then
locations=( kubeadm=$( get_bin "kubeadm" "cmd/kubeadm" )
"${KUBE_ROOT}/_output/bin/kubeadm"
"${KUBE_ROOT}/_output/dockerized/bin/${host_os}/${host_arch}/kubeadm"
"${KUBE_ROOT}/_output/local/bin/${host_os}/${host_arch}/kubeadm"
"${KUBE_ROOT}/bazel-bin/cmd/kubectl/kubeadm"
"${KUBE_ROOT}/platforms/${host_os}/${host_arch}/kubeadm"
)
kubeadm=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )
if [[ ! -x "$kubeadm" ]]; then if [[ ! -x "$kubeadm" ]]; then
{ print_error "kubeadm"
echo "It looks as if you don't have a compiled kubeadm binary"
echo
echo "If you are running from a clone of the git repo, please run"
echo "'./build/run.sh make cross'. Note that this requires having"
echo "Docker installed."
echo
echo "If you are running from a binary release tarball, something is wrong. "
echo "Look at http://kubernetes.io/ for information on how to contact the "
echo "development team for help."
} >&2
exit 1 exit 1
fi fi
elif [[ ! -x "${KUBEADM_PATH}" ]]; then elif [[ ! -x "${KUBEADM_PATH}" ]]; then
......
cluster/kubectl.sh
View file @ 25eb57ad
...@@ -32,79 +32,15 @@ set -o pipefail ...@@ -32,79 +32,15 @@ set -o pipefail
KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/..} KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/..}
source "${KUBE_ROOT}/cluster/kube-util.sh" source "${KUBE_ROOT}/cluster/kube-util.sh"
source "${KUBE_ROOT}/cluster/clientbin.sh"
# Get the absolute path of the directory component of a file, i.e. the
# absolute path of the dirname of $1.
get_absolute_dirname() {
echo "$(cd "$(dirname "$1")" && pwd)"
}
# Detect the OS name/arch so that we can find our binary
case "$(uname -s)" in
Darwin)
host_os=darwin
;;
Linux)
host_os=linux
;;
*)
echo "Unsupported host OS. Must be Linux or Mac OS X." >&2
exit 1
;;
esac
case "$(uname -m)" in
x86_64*)
host_arch=amd64
;;
i?86_64*)
host_arch=amd64
;;
amd64*)
host_arch=amd64
;;
arm*)
host_arch=arm
;;
i?86*)
host_arch=386
;;
s390x*)
host_arch=s390x
;;
ppc64le*)
host_arch=ppc64le
;;
*)
echo "Unsupported host arch. Must be x86_64, 386, arm, s390x or ppc64le." >&2
exit 1
;;
esac
# If KUBECTL_PATH isn't set, gather up the list of likely places and use ls # If KUBECTL_PATH isn't set, gather up the list of likely places and use ls
# to find the latest one. # to find the latest one.
if [[ -z "${KUBECTL_PATH:-}" ]]; then if [[ -z "${KUBECTL_PATH:-}" ]]; then
locations=( kubectl=$( get_bin "kubectl" "cmd/kubectl" )
"${KUBE_ROOT}/_output/bin/kubectl"
"${KUBE_ROOT}/_output/dockerized/bin/${host_os}/${host_arch}/kubectl"
"${KUBE_ROOT}/_output/local/bin/${host_os}/${host_arch}/kubectl"
"${KUBE_ROOT}/bazel-bin/cmd/kubectl/kubectl"
"${KUBE_ROOT}/platforms/${host_os}/${host_arch}/kubectl"
)
kubectl=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )
if [[ ! -x "$kubectl" ]]; then if [[ ! -x "$kubectl" ]]; then
{ print_error "kubectl"
echo "It looks as if you don't have a compiled kubectl binary"
echo
echo "If you are running from a clone of the git repo, please run"
echo "'./build/run.sh make cross'. Note that this requires having"
echo "Docker installed."
echo
echo "If you are running from a binary release tarball, something is wrong. "
echo "Look at http://kubernetes.io/ for information on how to contact the "
echo "development team for help."
} >&2
exit 1 exit 1
fi fi
elif [[ ! -x "${KUBECTL_PATH}" ]]; then elif [[ ! -x "${KUBECTL_PATH}" ]]; then
......
federation/cluster/federation-up.sh
View file @ 25eb57ad
...@@ -29,17 +29,13 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. ...@@ -29,17 +29,13 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
# For `kube::log::status` function since it already sources # For `kube::log::status` function since it already sources
# "${KUBE_ROOT}/cluster/lib/logging.sh" and DEFAULT_KUBECONFIG # "${KUBE_ROOT}/cluster/lib/logging.sh" and DEFAULT_KUBECONFIG
source "${KUBE_ROOT}/cluster/common.sh" source "${KUBE_ROOT}/cluster/common.sh"
# For $KUBE_PLATFORM, $KUBE_ARCH, $KUBE_BUILD_STAGE, # For $FEDERATION_PUSH_REPO_BASE and $FEDERATION_NAMESPACE.
# $FEDERATION_PUSH_REPO_BASE and $FEDERATION_NAMESPACE.
source "${KUBE_ROOT}/federation/cluster/common.sh" source "${KUBE_ROOT}/federation/cluster/common.sh"
FEDERATION_NAME="${FEDERATION_NAME:-e2e-federation}" FEDERATION_NAME="${FEDERATION_NAME:-e2e-federation}"
FEDERATION_KUBE_CONTEXT="${FEDERATION_KUBE_CONTEXT:-e2e-federation}" FEDERATION_KUBE_CONTEXT="${FEDERATION_KUBE_CONTEXT:-e2e-federation}"
DNS_ZONE_NAME="${FEDERATION_DNS_ZONE_NAME:-}" DNS_ZONE_NAME="${FEDERATION_DNS_ZONE_NAME:-}"
HOST_CLUSTER_CONTEXT="${FEDERATION_HOST_CLUSTER_CONTEXT:-${1}}" HOST_CLUSTER_CONTEXT="${FEDERATION_HOST_CLUSTER_CONTEXT:-${1}}"
readonly CLIENT_BIN_DIR="${KUBE_ROOT}/_output/${KUBE_BUILD_STAGE}/client/${KUBE_PLATFORM}-${KUBE_ARCH}/kubernetes/client/bin"
kubefed="${CLIENT_BIN_DIR}/kubefed"
kubectl="${CLIENT_BIN_DIR}/kubectl"
# Initializes the control plane. # Initializes the control plane.
# TODO(madhusudancs): Move this to federation/develop.sh. # TODO(madhusudancs): Move this to federation/develop.sh.
...@@ -50,7 +46,7 @@ function init() { ...@@ -50,7 +46,7 @@ function init() {
local -r kube_registry="${KUBE_REGISTRY:-gcr.io/${project}}" local -r kube_registry="${KUBE_REGISTRY:-gcr.io/${project}}"
local -r kube_version="${KUBERNETES_RELEASE:-}" local -r kube_version="${KUBERNETES_RELEASE:-}"
${kubefed} init \ "${KUBE_ROOT}/federation/develop/kubefed.sh" init \
"${FEDERATION_NAME}" \ "${FEDERATION_NAME}" \
--host-cluster-context="${HOST_CLUSTER_CONTEXT}" \ --host-cluster-context="${HOST_CLUSTER_CONTEXT}" \
--dns-zone-name="${DNS_ZONE_NAME}" \ --dns-zone-name="${DNS_ZONE_NAME}" \
...@@ -73,13 +69,17 @@ function create_cluster_secrets() { ...@@ -73,13 +69,17 @@ function create_cluster_secrets() {
name=$(echo "${dir}" | sed -e "s/_/-/g") # Replace "_" by "-" name=$(echo "${dir}" | sed -e "s/_/-/g") # Replace "_" by "-"
name=${name:0:252} name=${name:0:252}
kube::log::status "Creating secret with name: ${name} in namespace ${FEDERATION_NAMESPACE}" kube::log::status "Creating secret with name: ${name} in namespace ${FEDERATION_NAMESPACE}"
${kubectl} create secret generic ${name} --from-file="${base_dir}/${dir}/kubeconfig" --namespace="${FEDERATION_NAMESPACE}" "${KUBE_ROOT}/cluster/kubectl.sh" create secret generic ${name} --from-file="${base_dir}/${dir}/kubeconfig" --namespace="${FEDERATION_NAMESPACE}"
done done
} }
USE_KUBEFED="${USE_KUBEFED:-}" USE_KUBEFED="${USE_KUBEFED:-}"
if [[ "${USE_KUBEFED}" == "true" ]]; then if [[ "${USE_KUBEFED}" == "true" ]]; then
init init
# TODO(madhusudancs): Call to create_cluster_secrets and the function
# itself must be removed after implementing cluster join with kubefed
# here. This call is now required for the cluster joins in the
# BeforeEach blocks of each e2e test to work.
create_cluster_secrets create_cluster_secrets
else else
# Read the version back from the versions file if no version is given. # Read the version back from the versions file if no version is given.
......
federation/develop/kubefed.sh 0 → 100755
View file @ 25eb57ad
#!/bin/bash
# Copyright 2016 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -o errexit
set -o nounset
set -o pipefail
# "-=-=-=-=-=-=-=-=-=-="
# This script is only for CI testing purposes. Don't use it in production.
# "-=-=-=-=-=-=-=-=-=-="
KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/../..}
source "${KUBE_ROOT}/cluster/clientbin.sh"
# If KUBEFED_PATH isn't set, gather up the list of likely places and use ls
# to find the latest one.
if [[ -z "${KUBEFED_PATH:-}" ]]; then
kubefed=$( get_bin "kubefed" "federation/cmd/kubefed" )
if [[ ! -x "$kubefed" ]]; then
print_error "kubefed"
exit 1
fi
elif [[ ! -x "${KUBEFED_PATH}" ]]; then
{
echo "KUBEFED_PATH environment variable set to '${KUBEFED_PATH}', but "
echo "this doesn't seem to be a valid executable."
} >&2
exit 1
fi
kubefed="${KUBEFED_PATH:-${kubefed}}"
# Use the arguments to the script if it is set, a null string
# otherwise.
"${kubefed}" "${@+$@}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment