openstack
/
kolla-kubernetes
Code Issues Proposed changes

Fixes for Kubernetes 1.8 

Kubernetes 1.8 removed some options that we were still using.
This ports the code to use the new way of doing things. It
also bumps canal to the the 1.7 branch that suppots 1.8 too.

Change-Id: Iafedc49fdca7d76c524e00ae5e9da603649ad0c6
This commit is contained in:
Kevin Fox 2017-09-30 07:10:03 -07:00
parent 9ca5ae155c
commit b4f242f53e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/bin/setup_canal.sh
View File

@ -3,12 +3,12 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
url="https://raw.githubusercontent.com/projectcalico/canal/master"
url="$url/k8s-install/1.6/canal.yaml"
url="$url/k8s-install/1.7/canal.yaml"
curl "$url" -o /tmp/canal.yaml
url="https://raw.githubusercontent.com/projectcalico/canal/master"
url="$url/k8s-install/1.6/rbac.yaml"
url="$url/k8s-install/1.7/rbac.yaml"
curl "$url" -o /tmp/rbac.yaml

6
tools/setup_kubernetes.sh
View File

@ -64,11 +64,11 @@ if [ "$1" == "master" ]; then
sudo chown $(id -u):$(id -g) ~/.kube/config
tools/wait_for_kube_control_plane.sh
# NOTE(sbezverk/kfox111) This is a horible hack to get k8s 1.6 working. This should be
# NOTE(sbezverk/kfox111) This is a horible hack to get k8s 1.6+ working. This should be
# removed in favor of more fine grained rules.
# It should be run on the master only when it is up, hence moving it inside of if
kubectl update -f <(cat <<EOF
apiVersion: rbac.authorization.k8s.io/v1alpha1
kubectl apply -f <(cat <<EOF
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: cluster-admin