From 28b315ecd0f1ed8ea592652c779329bf4e042361 Mon Sep 17 00:00:00 2001 From: Roman Dobosz Date: Thu, 28 Jan 2021 14:10:30 +0100 Subject: [PATCH] Bump kubernetes verrion to 1.19.1. Change-Id: I198e1c2131b88009e87492f920d2579f20490989 --- devstack/plugin.sh | 4 ++-- devstack/settings | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f719c3170..91d97583e 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -535,7 +535,7 @@ function prepare_kubernetes_files { sudo CERT_DIR=${KURYR_KUBERNETES_DATA_DIR} /tmp/make-ca-cert.sh $(hostname -I | awk '{print $1}') "IP:${HOST_IP},IP:${k8s_api_clusterip},DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local" # Create basic token authorization - sudo bash -c "echo 'admin,admin,admin' > $KURYR_KUBERNETES_DATA_DIR/basic_auth.csv" + sudo bash -c "echo 'admin,admin,admin' > $KURYR_KUBERNETES_DATA_DIR/token_auth.csv" # Create known tokens for service accounts sudo bash -c "echo '$(create_token),admin,admin' >> ${KURYR_KUBERNETES_DATA_DIR}/known_tokens.csv" @@ -654,7 +654,7 @@ function run_k8s_api { --insecure-port=${KURYR_K8S_API_PORT} \ --etcd-servers=http://${SERVICE_HOST}:${ETCD_PORT} \ --client-ca-file=${KURYR_KUBERNETES_DATA_DIR}/ca.crt \ - --basic-auth-file=${KURYR_KUBERNETES_DATA_DIR}/basic_auth.csv \ + --token-auth-file=${KURYR_KUBERNETES_DATA_DIR}/token_auth.csv \ --min-request-timeout=300 \ --tls-cert-file=${KURYR_KUBERNETES_DATA_DIR}/server.cert \ --tls-private-key-file=${KURYR_KUBERNETES_DATA_DIR}/server.key \ diff --git a/devstack/settings b/devstack/settings index da64f7681..18c7c243c 100644 --- a/devstack/settings +++ b/devstack/settings @@ -28,7 +28,7 @@ ETCD_PORT=${ETCD_PORT:-2379} # KUBERNETES KURYR_KUBERNETES_DATA_DIR=${KURYR_KUBERNETES_DATA_DIR:-${DATA_DIR}/kubernetes} KURYR_CNI_PLUGINS=${KURYR_CNI_PLUGINS:-"https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz"} -KURYR_KUBERNETES_VERSION=${KURYR_KUBERNETES_VERSION:-v1.18.0} +KURYR_KUBERNETES_VERSION=${KURYR_KUBERNETES_VERSION:-v1.19.1} KURYR_KUBERNETES_BINARIES=${KURYR_KUBERNETES_BINARIES:-"https://storage.googleapis.com/kubernetes-release/release/${KURYR_KUBERNETES_VERSION}/bin/linux/amd64"} KURYR_KUBECTL_BINARY=${KURYR_KUBECTL_BINARY:-/usr/local/bin/kubectl} KURYR_KUBELET_BINARY=${KURYR_KUBELET_BINARY:-/usr/local/bin/kubelet}