diff --git a/docs/hardening.md b/docs/hardening.md index 5aa8fcfb0a4756caf3166bd5e638a3fa79c941b9..521e7d8c00f854634342d5679939bc4c8136dcd8 100644 --- a/docs/hardening.md +++ b/docs/hardening.md @@ -76,8 +76,6 @@ kube_controller_feature_gates: ["RotateKubeletServerCertificate=true"] ## kube-scheduler kube_scheduler_bind_address: 127.0.0.1 -kube_kubeadm_scheduler_extra_args: - profiling: false # AppArmor-based OS # kube_scheduler_feature_gates: ["AppArmor=true"] diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 index 3a84ad6948b05de9da93f8a5f523a4852bd946ae..e2d41fbe0e1f5b9aa719ba7e175f25259fb39c32 100644 --- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 +++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 @@ -351,6 +351,7 @@ scheduler: {% if kube_scheduler_feature_gates or kube_feature_gates %} feature-gates: "{{ kube_scheduler_feature_gates | default(kube_feature_gates, true) | join(',') }}" {% endif %} + profiling: "{{ kube_profiling }}" {% if kube_kubeadm_scheduler_extra_args|length > 0 %} {% for key in kube_kubeadm_scheduler_extra_args %} {{ key }}: "{{ kube_kubeadm_scheduler_extra_args[key] }}" diff --git a/tests/files/packet_ubuntu20-calico-aio-hardening.yml b/tests/files/packet_ubuntu20-calico-aio-hardening.yml index 76340d8733529ec032b12debdfa10ea3d332cb94..940c1fd8db7cd022dfd7904ea4bbce0b705e1f1f 100644 --- a/tests/files/packet_ubuntu20-calico-aio-hardening.yml +++ b/tests/files/packet_ubuntu20-calico-aio-hardening.yml @@ -70,8 +70,6 @@ kube_controller_feature_gates: ["RotateKubeletServerCertificate=true", "AppArmor ## kube-scheduler kube_scheduler_bind_address: 127.0.0.1 -kube_kubeadm_scheduler_extra_args: - profiling: false # AppArmor-based OS kube_scheduler_feature_gates: ["AppArmor=true"]