Skip to content

Commit

Permalink
Merge pull request #3301 from pachyderm/upgrade-kube-libraries
Browse files Browse the repository at this point in the history
Upgrade kube libraries to 1.13.0
  • Loading branch information
brycemcanally committed Dec 21, 2018
2 parents 09240db + 02def0c commit 5c36a2e
Show file tree
Hide file tree
Showing 547 changed files with 39,929 additions and 18,546 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dist: trusty
dist: xenial
sudo: required
services:
- docker
Expand Down
3 changes: 2 additions & 1 deletion etc/kube/start-minikube-vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ export -f get_images

## If the caller provided a tag, build and use that
export PACH_VERSION=local
MINIKUBE_FLAGS=()
KUBE_VERSION=v1.13.0
MINIKUBE_FLAGS=(--kubernetes-version="${KUBE_VERSION}")
eval "set -- $( getopt -l "tag:,cpus:,memory:" "--" "${0}" "${@:-}" )"
while true; do
case "${1}" in
Expand Down
15 changes: 3 additions & 12 deletions etc/kube/start-minikube.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -Eex

# Parse flags
VERSION=v1.8.0
VERSION=v1.13.0
minikube_args=(
--vm-driver=none
--kubernetes-version="${VERSION}"
Expand All @@ -13,9 +13,6 @@ while getopts ":v:r" opt; do
v)
VERSION="v${OPTARG}"
;;
r)
minikube_args+=("--extra-config=apiserver.Authorization.Mode=RBAC")
;;
\?)
echo "Invalid argument: ${opt}"
exit 1
Expand All @@ -24,7 +21,7 @@ while getopts ":v:r" opt; do
done

if [[ -n "${TRAVIS}" ]]; then
minikube_args+=("--bootstrapper=localkube")
minikube_args+=("--bootstrapper=kubeadm")
fi


Expand All @@ -36,11 +33,7 @@ while true; do
# Try to connect for one minute
for i in $(seq 12); do
if {
kubectl version 2>/dev/null >/dev/null && {
# Apply some manual changes to fix DNS.
kubectl -n kube-system describe sa/kube-dns ||
kubectl -n kube-system create sa kube-dns
}
kubectl version 2>/dev/null >/dev/null
}; then
HEALTHY=true
break
Expand All @@ -53,5 +46,3 @@ while true; do
minikube delete
sleep 10 # Wait for minikube to go completely down
done

until kubectl -n kube-system patch deploy/kube-dns -p '{"spec": {"template": {"spec": {"serviceAccountName": "kube-dns"}}}}' 2>/dev/null >/dev/null; do sleep 5; done
6 changes: 2 additions & 4 deletions etc/testing/ci/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,18 @@ cp etc/build/fuse.conf /etc/fuse.conf
chown root:$USER /etc/fuse.conf

# Install kubectl
# Latest as of 5/30/2018
# To get the latest kubectl version:
# curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt
KUBECTL_VERSION=v1.10.3
KUBECTL_VERSION=v1.13.0
curl -L -o kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
chmod +x ./kubectl && \
sudo mv ./kubectl /usr/local/bin/kubectl
kubectl version --client

# Install minikube
# Latest as of 8/7/2018
# To get the latest minikube version:
# curl https://api.github.com/repos/kubernetes/minikube/releases | jq -r .[].tag_name | sort | tail -n1
MINIKUBE_VERSION=v0.28.2
MINIKUBE_VERSION=v0.31.0
curl -L -o minikube https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-amd64 && \
chmod +x ./minikube && \
sudo mv ./minikube /usr/local/bin/minikube
Expand Down
11 changes: 4 additions & 7 deletions etc/testing/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ set -e
mkdir -p ~/.cache/go-build
sudo chown -R `whoami` ~/.cache/go-build

# See https://github.com/kubernetes/minikube/issues/2704
minikube="minikube --bootstrapper=localkube"

${minikube} delete || true # In case we get a recycled machine
minikube delete || true # In case we get a recycled machine
make launch-kube
sleep 5

Expand All @@ -18,21 +15,21 @@ echo "Waiting for connection to kubernetes..."
max_t=90
WHEEL="\|/-";
until {
${minikube} status 2>&1 >/dev/null
minikube status 2>&1 >/dev/null
kubectl version 2>&1 >/dev/null
}; do
if ((max_t-- <= 0)); then
echo "Could not connect to minikube"
echo "minikube status --alsologtostderr --loglevel=0 -v9:"
echo "==================================================="
${minikube} status --alsologtostderr --loglevel=0 -v9
minikube status --alsologtostderr --loglevel=0 -v9
exit 1
fi
echo -en "\e[G$${WHEEL:0:1}";
WHEEL="$${WHEEL:1}$${WHEEL:0:1}";
sleep 1;
done
${minikube} status
minikube status
kubectl version

echo "Running test suite based on BUCKET=$BUCKET"
Expand Down

0 comments on commit 5c36a2e

Please sign in to comment.