diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-03 21:52:09 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-03 21:52:09 -0700 |
commit | 86643ad6e12d10803fdae5e103a7392795c35a8d (patch) | |
tree | 71562b1156b49e812c30f660cf140894267aec0a /roles/openshift_node_bootstrap_configmap/templates/node-config.yaml.j2 | |
parent | 413fe019b488b75909629c68949ba693004afd6a (diff) | |
parent | 983fdade31c57654854cce3c5340e8bf5a7838e7 (diff) | |
download | openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.gz openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.bz2 openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.xz openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.zip |
Merge pull request #6006 from mgugino-upstream-stage/elb-v2
Automatic merge from submit-queue.
Bootstrap enhancements.
This includes the elb work.
Diffstat (limited to 'roles/openshift_node_bootstrap_configmap/templates/node-config.yaml.j2')
-rw-r--r-- | roles/openshift_node_bootstrap_configmap/templates/node-config.yaml.j2 | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/roles/openshift_node_bootstrap_configmap/templates/node-config.yaml.j2 b/roles/openshift_node_bootstrap_configmap/templates/node-config.yaml.j2 new file mode 100644 index 000000000..d533b88fa --- /dev/null +++ b/roles/openshift_node_bootstrap_configmap/templates/node-config.yaml.j2 @@ -0,0 +1,53 @@ +allowDisabledDocker: false +apiVersion: v1 +authConfig: + authenticationCacheSize: 1000 + authenticationCacheTTL: 5m + authorizationCacheSize: 1000 + authorizationCacheTTL: 5m +dnsBindAddress: "127.0.0.1:53" +dnsDomain: cluster.local +dnsIP: 0.0.0.0 +dnsNameservers: null +dnsRecursiveResolvConf: /etc/origin/node/resolv.conf +dockerConfig: + dockerShimRootDirectory: /var/lib/dockershim + dockerShimSocket: /var/run/dockershim.sock + execHandlerName: native +enableUnidling: true +imageConfig: + format: "{{ openshift_imageconfig_format }}" + latest: false +iptablesSyncPeriod: 30s +kind: NodeConfig +kubeletArguments: + cloud-config: + - /etc/origin/cloudprovider/{{ openshift_node_bootstrap_configmap_cloud_provider }}.conf + cloud-provider: + - {{ openshift_node_bootstrap_configmap_cloud_provider }} + node-labels: {{ openshift_node_bootstrap_configmap_default_labels | union(openshift_node_bootstrap_configmap_custom_labels) | list | to_json }} +masterClientConnectionOverrides: + acceptContentTypes: application/vnd.kubernetes.protobuf,application/json + burst: 40 + contentType: application/vnd.kubernetes.protobuf + qps: 20 +masterKubeConfig: node.kubeconfig +networkConfig: + mtu: "{{ openshift_node_bootstrap_configmap_network_mtu }}" + networkPluginName: {{ openshift_node_bootstrap_configmap_network_plugin }} +nodeIP: "" +podManifestConfig: null +servingInfo: + bindAddress: 0.0.0.0:10250 + bindNetwork: tcp4 + certFile: server.crt + clientCA: node-client-ca.crt + keyFile: server.key + namedCertificates: null +volumeConfig: + localQuota: + perFSGroup: null +volumeDirectory: {{ openshift_node_bootstrap_configmap_node_data_dir }}/openshift.local.volumes +enable-controller-attach-detach: +- 'true' +networkPluginName: {{ openshift_node_bootstrap_configmap_network_plugin }} |