Skip to content

K
k3s
Unverified Commit f301fce7 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #66092 from kwmonroe/feature/addons-registry

Automatic merge from submit-queue (batch tested with PRs 66095, 66092). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. make the addons docker registry configurable **What this PR does / why we need it**: Allow users to configure the docker registry used when applying cdk-addons templates. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: Depends on https://github.com/juju-solutions/cdk-addons/pull/45 **Release note**: ```release-note Expose docker registry config for addons used in Juju deployments ```
parents 535a6838 1cd8569b
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
cluster/juju/layers/kubernetes-master/config.yaml
View file @ f301fce7
...@@ -43,6 +43,10 @@ options: ...@@ -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
......
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View file @ f301fce7
...@@ -719,6 +719,7 @@ def configure_cdk_addons(): ...@@ -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(): ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment