github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-05 03:03:40 +00:00
Code Issues Projects Releases Wiki Activity

Move sourcing of provider-specific util.sh into kube-util.sh

Browse Source 
- kube-util.sh defines default implementations
- provider util.sh overrides the default implementations as desired
- default kube-util functions now print to stderr to avoid affecting
  captured output
This commit is contained in:
Karl Isenberg
2015-07-02 09:48:31 -07:00
parent 05ce0472e9
commit 0229cb01fc
7 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/validate-cluster.sh
View File

@@ -22,7 +22,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
source "${KUBE_ROOT}/cluster/kube-util.sh"
MINIONS_FILE=/tmp/minions-$$
trap 'rm -rf "${MINIONS_FILE}"' EXIT