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 ```

Merge pull request #66092 from kwmonroe/feature/addons-registry
f301fce7 · Kubernetes Submit Queue · GitHub · 535a6838 · 1cd8569b · f301fce7
Unverified Commit f301fce7 authored Jul 12, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 12, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

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.
--- a/cluster/juju/layers/kubernetes-master/config.yaml
+++ b/cluster/juju/layers/kubernetes-master/config.yaml
@@ -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"

--- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
+++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
@@ -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,