github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

make the addons docker registry configurable

Browse Source
This commit is contained in:
Kevin W Monroe 2018-07-11 18:38:36 -05:00
parent f26e9671c8
commit 1cd8569b65
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,10 @@ options:
Audit webhook config passed to kube-apiserver via --audit-webhook-config-file. Audit webhook config passed to kube-apiserver via --audit-webhook-config-file.
For more info, please refer to the upstream documentation at For more info, please refer to the upstream documentation at
https://kubernetes.io/docs/tasks/debug-application-cluster/audit/ https://kubernetes.io/docs/tasks/debug-application-cluster/audit/
addons-registry:
type: string
default: ""
description: Specify the docker registry to use when applying addons
enable-dashboard-addons: enable-dashboard-addons:
type: boolean type: boolean
default: True default: True
@ -74,7 +78,7 @@ options:
privileged mode by default. If "false", kube-apiserver will never run in privileged mode by default. If "false", kube-apiserver will never run in
privileged mode. If "auto", kube-apiserver will not run in privileged privileged mode. If "auto", kube-apiserver will not run in privileged
mode by default, but will switch to privileged mode if gpu hardware is mode by default, but will switch to privileged mode if gpu hardware is
detected on a worker node. detected on a worker node.
enable-nvidia-plugin: enable-nvidia-plugin:
type: string type: string
default: "auto" default: "auto"

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

@ -719,6 +719,7 @@ def configure_cdk_addons():
gpuEnable = (get_version('kube-apiserver') >= (1, 9) and gpuEnable = (get_version('kube-apiserver') >= (1, 9) and
load_gpu_plugin == "auto" and load_gpu_plugin == "auto" and
is_state('kubernetes-master.gpu.enabled')) is_state('kubernetes-master.gpu.enabled'))
registry = hookenv.config('addons-registry')
dbEnabled = str(hookenv.config('enable-dashboard-addons')).lower() dbEnabled = str(hookenv.config('enable-dashboard-addons')).lower()
dnsEnabled = str(hookenv.config('enable-kube-dns')).lower() dnsEnabled = str(hookenv.config('enable-kube-dns')).lower()
metricsEnabled = str(hookenv.config('enable-metrics')).lower() metricsEnabled = str(hookenv.config('enable-metrics')).lower()
@ -726,6 +727,7 @@ def configure_cdk_addons():
'arch=' + arch(), 'arch=' + arch(),
'dns-ip=' + get_deprecated_dns_ip(), 'dns-ip=' + get_deprecated_dns_ip(),
'dns-domain=' + hookenv.config('dns_domain'), 'dns-domain=' + hookenv.config('dns_domain'),
'registry=' + registry,
'enable-dashboard=' + dbEnabled, 'enable-dashboard=' + dbEnabled,
'enable-kube-dns=' + dnsEnabled, 'enable-kube-dns=' + dnsEnabled,
'enable-metrics=' + metricsEnabled, 'enable-metrics=' + metricsEnabled,