github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed the bad branch merge issue

Browse Source
This commit is contained in:
calvinh
2018-06-01 18:58:55 +01:00
parent 7322f7f137
commit 28b5587594
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View File

@@ -1000,16 +1000,10 @@ def build_kubeconfig(server):
if ca_exists and client_pass:
# Create an absolute path for the kubeconfig file.
kubeconfig_path = os.path.join(os.sep, 'home', 'ubuntu', 'config')
# set context_name based on combination of modelname and userinput
context_name = hookenv.config('cluster-context')
if not context_name:
context_name = 'cdk-'+os.environ['JUJU_MODEL_NAME']
else:
context_name = 'cdk-'+context_name
# Create the kubeconfig on this system so users can access the cluster.
create_kubeconfig(kubeconfig_path, server, ca, user=context_name+'-admin',
context=context_name+'-context',
cluster=context_name,password=client_pass)
create_kubeconfig(kubeconfig_path, server, ca,
user='admin', password=client_pass)
# Make the config file readable by the ubuntu users so juju scp works.
cmd = ['chown', 'ubuntu:ubuntu', kubeconfig_path]
check_call(cmd)
@@ -1597,4 +1591,4 @@ def _write_gcp_snap_config(component):
if gcp_creds_env_key not in daemon_env:
daemon_env += '{}={}\n'.format(gcp_creds_env_key, creds_path)
daemon_env_path.parent.mkdir(parents=True, exist_ok=True)
daemon_env_path.write_text(daemon_env)
daemon_env_path.write_text(daemon_env)