Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
1cd8569b
Commit
1cd8569b
authored
Jul 11, 2018
by
Kevin W Monroe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make the addons docker registry configurable
parent
f26e9671
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
config.yaml
cluster/juju/layers/kubernetes-master/config.yaml
+5
-1
kubernetes_master.py
...ju/layers/kubernetes-master/reactive/kubernetes_master.py
+2
-0
No files found.
cluster/juju/layers/kubernetes-master/config.yaml
View file @
1cd8569b
...
...
@@ -43,6 +43,10 @@ options:
Audit webhook config passed to kube-apiserver via --audit-webhook-config-file.
For more info, please refer to the upstream documentation at
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
:
type
:
boolean
default
:
True
...
...
@@ -74,7 +78,7 @@ options:
privileged mode by default. If "false", kube-apiserver will never run in
privileged mode. If "auto", kube-apiserver will not run in privileged
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
:
type
:
string
default
:
"
auto"
...
...
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View file @
1cd8569b
...
...
@@ -719,6 +719,7 @@ def configure_cdk_addons():
gpuEnable
=
(
get_version
(
'kube-apiserver'
)
>=
(
1
,
9
)
and
load_gpu_plugin
==
"auto"
and
is_state
(
'kubernetes-master.gpu.enabled'
))
registry
=
hookenv
.
config
(
'addons-registry'
)
dbEnabled
=
str
(
hookenv
.
config
(
'enable-dashboard-addons'
))
.
lower
()
dnsEnabled
=
str
(
hookenv
.
config
(
'enable-kube-dns'
))
.
lower
()
metricsEnabled
=
str
(
hookenv
.
config
(
'enable-metrics'
))
.
lower
()
...
...
@@ -726,6 +727,7 @@ def configure_cdk_addons():
'arch='
+
arch
(),
'dns-ip='
+
get_deprecated_dns_ip
(),
'dns-domain='
+
hookenv
.
config
(
'dns_domain'
),
'registry='
+
registry
,
'enable-dashboard='
+
dbEnabled
,
'enable-kube-dns='
+
dnsEnabled
,
'enable-metrics='
+
metricsEnabled
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment