Skip to content

Commit 2152394

Browse files
committed
Expose direct control over dockerd options.
1 parent 571064e commit 2152394

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

profile.py

+5
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@
8989
portal.ParameterType.STRING,"",
9090
longDescription="A specific Docker version to install; if left empty, Kubespray will choose its current stable version and install that. As explained in the Kubespray documentation (https://github.com/kubernetes-sigs/kubespray/blob/master/docs/vars.md), this value must be one of those listed at, e.g. https://github.com/kubernetes-sigs/kubespray/blob/release-2.13/roles/container-engine/docker/vars/ubuntu-amd64.yml .",
9191
advanced=True)
92+
pc.defineParameter(
93+
"dockerOptions","Dockerd Options",
94+
portal.ParameterType.STRING,"",
95+
longDescription="Extra command-line options to pass to dockerd. The most common option is probably an --insecure-registry .",
96+
advanced=True)
9297
pc.defineParameter(
9398
"kubeNetworkPlugin","Kubernetes Network Plugin",
9499
portal.ParameterType.STRING,"calico",

setup-kubespray.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ cat <<EOF >>$INVDIR/group_vars/k8s-cluster/k8s-cluster.yml
267267
docker_dns_servers_strict: false
268268
kubectl_localhost: true
269269
kubeconfig_localhost: true
270-
docker_options: "$DOCKOPTS"
270+
docker_options: "$DOCKOPTS ${DOCKEROPTIONS}"
271271
metrics_server_enabled: true
272272
kube_basic_auth: true
273273
kube_api_pwd: "$ADMIN_PASS"

setup-lib.sh

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ KUBESPRAYUSEVIRTUALENV=1
7474
KUBESPRAY_VIRTUALENV=kubespray-virtualenv
7575
KUBESPRAYVERSION=release-2.13
7676
DOCKERVERSION=
77+
DOCKEROPTIONS=
7778
KUBEVERSION=
7879
HELMVERSION=
7980
KUBENETWORKPLUGIN="calico"

0 commit comments

Comments
 (0)