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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/juju/layers/kubernetes-master/config.yaml
View File

@ -23,7 +23,7 @@ options:
description: CIDR to user for Kubernetes services. Cannot be changed after deployment. description: CIDR to user for Kubernetes services. Cannot be changed after deployment.
allow-privileged: allow-privileged:
type: string type: string
default: "true" default: "auto"
description: | description: |
Allow kube-apiserver to run in privileged mode. Supported values are Allow kube-apiserver to run in privileged mode. Supported values are
"true", "false", and "auto". If "true", kube-apiserver will run in "true", "false", and "auto". If "true", kube-apiserver will run in
@ -82,11 +82,6 @@ options:
description: | description: |
Comma separated authorization modes. Allowed values are Comma separated authorization modes. Allowed values are
"RBAC", "Node", "Webhook", "ABAC", "AlwaysDeny" and "AlwaysAllow". "RBAC", "Node", "Webhook", "ABAC", "AlwaysDeny" and "AlwaysAllow".
cluster-context:
type: string
default: ""
description: |
When specified, the juju model name will be overridden in the kube config.
require-manual-upgrade: require-manual-upgrade:
type: boolean type: boolean
default: true default: true

12
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: if ca_exists and client_pass:
# Create an absolute path for the kubeconfig file. # Create an absolute path for the kubeconfig file.
kubeconfig_path = os.path.join(os.sep, 'home', 'ubuntu', 'config') 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 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', create_kubeconfig(kubeconfig_path, server, ca,
cluster=context_name,password=client_pass) user='admin', password=client_pass)
# Make the config file readable by the ubuntu users so juju scp works. # Make the config file readable by the ubuntu users so juju scp works.
cmd = ['chown', 'ubuntu:ubuntu', kubeconfig_path] cmd = ['chown', 'ubuntu:ubuntu', kubeconfig_path]
check_call(cmd) check_call(cmd)