summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVijendar Komalla <vijendar.komalla@RACKSPACE.COM>2017-03-01 17:17:21 -0600
committerMohammed Naser <mnaser@vexxhost.com>2017-07-24 14:35:13 +0000
commit7cf0b5051ac85977c49fafd1876aa3c773355b75 (patch)
tree7b892469bd54c2fa8a1f17142ffa2ad4c5c6f682
parentb410770989fb53fed170a1fa503fe8ba176a5e6d (diff)
Set k8s apiserver preferred address type arg
Currently not able to run kubectl exec/logs commands with a k8s cluster created on devstack. This is due to the fact that apiserver is not able to resolve the worker node by hostname. This change fixes the issue by passing --kubelet-preferred-address-types argument to apiserver. Change-Id: I9d328626723d11372a6d912fae4edd33b8f01277 Closes-Bug: #1668337 (cherry picked from commit 396439f703aea8598a07adac6b562c714fa19113)
Notes
Notes (review): Code-Review+2: Spyros Trigazis (strigazi) <strigazi@gmail.com> Code-Review+2: yatin <ykarel@redhat.com> Workflow+1: yatin <ykarel@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 24 Jul 2017 17:28:13 +0000 Reviewed-on: https://review.openstack.org/486634 Project: openstack/magnum Branch: refs/heads/stable/ocata
-rw-r--r--magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
index b038936..c6de5b2 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
@@ -18,6 +18,7 @@ else
18 KUBE_API_ARGS="$KUBE_API_ARGS --tls-cert-file=/srv/kubernetes/server.crt" 18 KUBE_API_ARGS="$KUBE_API_ARGS --tls-cert-file=/srv/kubernetes/server.crt"
19 KUBE_API_ARGS="$KUBE_API_ARGS --tls-private-key-file=/srv/kubernetes/server.key" 19 KUBE_API_ARGS="$KUBE_API_ARGS --tls-private-key-file=/srv/kubernetes/server.key"
20 KUBE_API_ARGS="$KUBE_API_ARGS --client-ca-file=/srv/kubernetes/ca.crt" 20 KUBE_API_ARGS="$KUBE_API_ARGS --client-ca-file=/srv/kubernetes/ca.crt"
21 KUBE_API_ARGS="$KUBE_API_ARGS --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP"
21fi 22fi
22 23
23KUBE_ADMISSION_CONTROL="" 24KUBE_ADMISSION_CONTROL=""