From d81b2dfb804507db9b46ca7384a9c155b3129281 Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Mon, 8 Aug 2016 17:30:55 -0500 Subject: [PATCH] Fix the CoreOS fragment write-kubeconfig.yaml This file was incorrectly copied to CoreOS during bay driver refactoring. Change-Id: I1032caa775e55bf09f404015850d207ca753676e Closes-Bug: #1611136 --- .../templates/fragments/write-kubeconfig.yaml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/write-kubeconfig.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/write-kubeconfig.yaml index 659adfbfab..c6661bbb20 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/write-kubeconfig.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/write-kubeconfig.yaml @@ -1,24 +1,24 @@ #cloud-config merge_how: dict(recurse_array)+list(append) write_files: - - path: /srv/kubernetes/kubeconfig.yaml + - path: /etc/kubernetes/config/worker-kubeconfig.yaml owner: "root:root" permissions: "0644" content: | apiVersion: v1 kind: Config - users: - - name: kubeclient - user: - client-certificate: CLIENT_CERT - client-key: CLIENT_KEY clusters: - - name: kubernetes + - name: local cluster: - certificate-authority: CA_CERT + certificate-authority: /etc/kubernetes/ssl/ca.pem + users: + - name: kubelet + user: + client-certificate: /etc/kubernetes/ssl/worker.pem + client-key: /etc/kubernetes/ssl/worker-key.pem contexts: - context: - cluster: kubernetes - user: kubeclient - name: service-account-context - current-context: service-account-context + cluster: local + user: kubelet + name: kubelet-context + current-context: kubelet-context