X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fkubelet%2Fdefaults%2Fmain.yaml;h=c9634b31d8f876b1c3c8a029c3e5e1305f902c60;hb=cacedcd28a2267925c9aa37733569bb017774877;hp=1bf3c9abb7bcd7762af4c4295405815155e641b6;hpb=8321feb501701dcb4023e3c052cb6a982d5db3fa;p=ta%2Fcaas-kubernetes.git

diff --git a/ansible/roles/kubelet/defaults/main.yaml b/ansible/roles/kubelet/defaults/main.yaml
index 1bf3c9a..c9634b3 100644
--- a/ansible/roles/kubelet/defaults/main.yaml
+++ b/ansible/roles/kubelet/defaults/main.yaml
@@ -13,15 +13,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+kubelet_healthcheck_port: 10248
+
 kubelet_kubeconfig_path: "{% if nodename | search('caas_master') %}/etc/kubernetes/kubeconfig/kubeletc.yml{% else %}/root/kubeletc.yml{% endif %}"
 
 common_kubelet_params:
-  - "--hostname-override={{ networking.infra_internal.ip }}"
+  - "--hostname-override={{ hostname }}"
   - "--kubeconfig={{ kubelet_kubeconfig_path }}"
   - "--network-plugin=cni"
   - "--node-labels={{ lookup('template', 'node_labels.j2') | trim }}"
   - "--pod-infra-container-image={{ container_image_names | select('search', '/kubernetespause') | list | last }}"
   - "--register-node=true"
+  - "--enable-debugging-handlers=false"
 
 master_kubelet_params:
   - "--config=/etc/kubernetes/kubeconfig/master-config.yaml"
@@ -34,3 +37,9 @@ kubectl_configs:
   - path: "/home/{{ users.admin_user_name }}/.kube/config"
     owner: "{{ users.admin_user_name }}"
     group: "{{ users.admin_user_name }}"
+
+kube_reserved_cpu: 0
+total_cpus: "{{ ansible_local['cpu_allocation'].values() | map(attribute='set') | map('length') | sum }}"
+default_allocation: "{{ caas.cpu_allocation_mapping | get_mapped_key('pool_name', 'default') }}"
+default_cpu: "{{ ansible_local['cpu_allocation'].get(default_allocation, {}).get('set', []) | length }}"
+system_reserved_cpu: "{{ total_cpus|int - kube_reserved_cpu|int - default_cpu|int  }}"