From 858afb085dab78018f90ff17871b83c1dd9ba5bd Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sun, 5 Nov 2017 01:03:05 -0400 Subject: Revert "Bootstrap enhancements." --- .../templates/node-config.yaml.j2 | 53 ---------------------- 1 file changed, 53 deletions(-) delete mode 100644 roles/openshift_node_bootstrap_configmap/templates/node-config.yaml.j2 (limited to 'roles/openshift_node_bootstrap_configmap/templates') diff --git a/roles/openshift_node_bootstrap_configmap/templates/node-config.yaml.j2 b/roles/openshift_node_bootstrap_configmap/templates/node-config.yaml.j2 deleted file mode 100644 index d533b88fa..000000000 --- a/roles/openshift_node_bootstrap_configmap/templates/node-config.yaml.j2 +++ /dev/null @@ -1,53 +0,0 @@ -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 }} -- cgit v1.2.3