summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh b/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh
index 363867e..79eb7ba 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh
@@ -80,6 +80,15 @@ EOF
80} 80}
81kubectl apply --validate=false -f ${ADMIN_RBAC} 81kubectl apply --validate=false -f ${ADMIN_RBAC}
82 82
83# Add the openstack trustee as a secret under kube-system
84kubectl -n kube-system create secret generic os-trustee \
85 --from-literal=os-authURL=${AUTH_URL} \
86 --from-literal=os-trustID=${TRUST_ID} \
87 --from-literal=os-trusteeID=${TRUSTEE_USER_ID} \
88 --from-literal=os-trusteePassword=${TRUSTEE_PASSWORD} \
89 --from-literal=os-region=${REGION_NAME} \
90 --from-file=os-certAuthority=/etc/kubernetes/ca-bundle.crt
91
83#TODO: add heat variables for master count to determine leaderelect true/False ? 92#TODO: add heat variables for master count to determine leaderelect true/False ?
84if [ -n "${TRUST_ID}" ] && [ "$(echo "${CLOUD_PROVIDER_ENABLED}" | tr '[:upper:]' '[:lower:]')" = "true" ]; then 93if [ -n "${TRUST_ID}" ] && [ "$(echo "${CLOUD_PROVIDER_ENABLED}" | tr '[:upper:]' '[:lower:]')" = "true" ]; then
85 occm_image="${CONTAINER_INFRA_PREFIX:-docker.io/k8scloudprovider/}openstack-cloud-controller-manager:${CLOUD_PROVIDER_TAG}" 94 occm_image="${CONTAINER_INFRA_PREFIX:-docker.io/k8scloudprovider/}openstack-cloud-controller-manager:${CLOUD_PROVIDER_TAG}"