openstack/kuryr-kubernetes
Code Issues Proposed changes

Merge "Just check k8s 1.16"

Browse Source
This commit is contained in:
Zuul
2019-10-17 19:21:55 +00:00
committed by Gerrit Code Review
parent 0e312184b5 1f3ee029dc
commit 6446f70da0
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@@ -627,7 +627,7 @@ function run_k8s_api {
command+=(--restart=on-failure) command+=(--restart=on-failure)
fi fi
command+=(${KURYR_HYPERKUBE_IMAGE}:${KURYR_HYPERKUBE_VERSION} command+=(${KURYR_HYPERKUBE_IMAGE}:${KURYR_HYPERKUBE_VERSION}
/hyperkube apiserver /hyperkube kube-apiserver
--service-cluster-ip-range=${cluster_ip_range} --service-cluster-ip-range=${cluster_ip_range}
--insecure-bind-address=0.0.0.0 --insecure-bind-address=0.0.0.0
--insecure-port=${KURYR_K8S_API_PORT} --insecure-port=${KURYR_K8S_API_PORT}
@@ -657,7 +657,7 @@ function run_k8s_controller_manager {
command+=(--restart=on-failure) command+=(--restart=on-failure)
fi fi
command+=(${KURYR_HYPERKUBE_IMAGE}:${KURYR_HYPERKUBE_VERSION} command+=(${KURYR_HYPERKUBE_IMAGE}:${KURYR_HYPERKUBE_VERSION}
/hyperkube controller-manager /hyperkube kube-controller-manager
--master=$KURYR_K8S_API_URL --master=$KURYR_K8S_API_URL
--service-account-private-key-file=/srv/kubernetes/server.key --service-account-private-key-file=/srv/kubernetes/server.key
--root-ca-file=/srv/kubernetes/ca.crt --root-ca-file=/srv/kubernetes/ca.crt
@@ -680,7 +680,7 @@ function run_k8s_scheduler {
command+=(--restart=on-failure) command+=(--restart=on-failure)
fi fi
command+=(${KURYR_HYPERKUBE_IMAGE}:${KURYR_HYPERKUBE_VERSION} command+=(${KURYR_HYPERKUBE_IMAGE}:${KURYR_HYPERKUBE_VERSION}
/hyperkube scheduler /hyperkube kube-scheduler
--master=$KURYR_K8S_API_URL --master=$KURYR_K8S_API_URL
--v=$(get_k8s_log_level) --v=$(get_k8s_log_level)
--logtostderr=true) --logtostderr=true)
@@ -757,7 +757,6 @@ function run_k8s_kubelet {
sudo mkdir -p "${KURYR_HYPERKUBE_DATA_DIR}/"{kubelet,kubelet.cert} sudo mkdir -p "${KURYR_HYPERKUBE_DATA_DIR}/"{kubelet,kubelet.cert}
command="$KURYR_HYPERKUBE_BINARY kubelet\ command="$KURYR_HYPERKUBE_BINARY kubelet\
--kubeconfig=${HOME}/.kube/config \ --kubeconfig=${HOME}/.kube/config \
--allow-privileged=true \
--v=2 \ --v=2 \
--address=0.0.0.0 \ --address=0.0.0.0 \
--enable-server \ --enable-server \

2
devstack/settings
View File

@@ -28,7 +28,7 @@ ETCD_PORT=${ETCD_PORT:-2379}
# HYPERKUBE # HYPERKUBE
KURYR_HYPERKUBE_IMAGE=${KURYR_HYPERKUBE_IMAGE:-gcr.io/google_containers/hyperkube-amd64} KURYR_HYPERKUBE_IMAGE=${KURYR_HYPERKUBE_IMAGE:-gcr.io/google_containers/hyperkube-amd64}
# Tested with 1.8.15, 1.9.10, 1.10.8, 1.11.3, 1.12.2 and 1.13.0 # Tested with 1.8.15, 1.9.10, 1.10.8, 1.11.3, 1.12.2 and 1.13.0
KURYR_HYPERKUBE_VERSION=${KURYR_HYPERKUBE_VERSION:-v1.13.0} KURYR_HYPERKUBE_VERSION=${KURYR_HYPERKUBE_VERSION:-v1.16.0}
KURYR_HYPERKUBE_DATA_DIR=${KURYR_HYPERKUBE_DATA_DIR:-${DATA_DIR}/hyperkube} KURYR_HYPERKUBE_DATA_DIR=${KURYR_HYPERKUBE_DATA_DIR:-${DATA_DIR}/hyperkube}
KURYR_HYPERKUBE_BINARY=${KURYR_HYPERKUBE_BINARY:-/usr/local/bin/hyperkube} KURYR_HYPERKUBE_BINARY=${KURYR_HYPERKUBE_BINARY:-/usr/local/bin/hyperkube}