X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fkubelet%2Ftemplates%2Fmaster-config.yaml.j2;h=95b0d7b7bde0edfe2a9e96af25633492f863ac37;hb=df3fea70cdc2661a7cfd5fbadcbc5a857b7c6413;hp=453bb022a7153066a76ff97c5807331d60cce8cc;hpb=ed93069afc19b80dc0cfc8c518a81b022fde71e5;p=ta%2Fcaas-kubernetes.git

diff --git a/ansible/roles/kubelet/templates/master-config.yaml.j2 b/ansible/roles/kubelet/templates/master-config.yaml.j2
index 453bb02..95b0d7b 100644
--- a/ansible/roles/kubelet/templates/master-config.yaml.j2
+++ b/ansible/roles/kubelet/templates/master-config.yaml.j2
@@ -1,3 +1,4 @@
+#jinja2:trim_blocks:False
 {#
 Copyright 2019 Nokia
 
@@ -14,30 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 #}
 ---
-apiVersion: kubelet.config.k8s.io/v1beta1
-kind: KubeletConfiguration
-address: "{{ networking.infra_internal.ip }}"
-authentication:
-  x509:
-    clientCAFile: "/etc/openssl/ca.pem"
-  webhook:
-    enabled: true
-  anonymous:
-    enabled: false
-authorization:
-  mode: "AlwaysAllow"
-cgroupsPerQOS: true
-cgroupRoot: "/"
-cgroupDriver: cgroupfs
-clusterDNS:
-- {{ caas.dns_svc_ip }}
-clusterDomain: {{ caas.dns_domain }}
-staticPodPath: "/etc/kubernetes/manifests"
-rotateCertificates: true
-runtimeRequestTimeout: 5m0s
-streamingConnectionIdleTimeout: 5m0s
-tlsCertFile: "/etc/kubernetes/ssl/kubelet-server.pem"
-tlsPrivateKeyFile: "/etc/kubernetes/ssl/kubelet-server-key.pem"
+{% include 'common-config.yaml.j2' %}
 featureGates:
   CPUManager: false
   DevicePlugins: true