From 6b7146bc0a9640feb453385dab9aa42c1536abd2 Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Thu, 28 Dec 2023 10:21:44 -0500 Subject: [PATCH 1/2] Ensure correct scheduler extra arguments passed to v1beta3 template --- templates/v1beta3/config_kubeadm.yaml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/v1beta3/config_kubeadm.yaml.erb b/templates/v1beta3/config_kubeadm.yaml.erb index 3d595b65..44eb1e5b 100644 --- a/templates/v1beta3/config_kubeadm.yaml.erb +++ b/templates/v1beta3/config_kubeadm.yaml.erb @@ -84,9 +84,9 @@ controllerManager: <%- end -%> <%- end -%> scheduler: -<%- if @scheduler_merged_extra_arguments -%> +<%- if @scheduler_extra_arguments -%> extraArgs: - <%- @scheduler_merged_extra_arguments.each do |arg| -%> + <%- @scheduler_extra_arguments.each do |arg| -%> <%= arg %> <%- end -%> <%- end -%> From 9f5a9c57e4600c61b02f7287cc8299703364d0f6 Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Tue, 9 Jan 2024 15:28:39 -0500 Subject: [PATCH 2/2] Add unit tests for scheduler extra arguments --- spec/classes/config/kubeadm_spec.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/spec/classes/config/kubeadm_spec.rb b/spec/classes/config/kubeadm_spec.rb index b378a45f..bc31e073 100644 --- a/spec/classes/config/kubeadm_spec.rb +++ b/spec/classes/config/kubeadm_spec.rb @@ -600,4 +600,20 @@ .with_content(%r{key: node-role.kubernetes.io/control-plane\n}) } end + + context 'when scheduler_extra_arguments is defined' do + let(:params) do + { + 'kubernetes_version' => '1.26.0', + 'scheduler_extra_arguments' => ['bind-address: 0.0.0.0'] + } + end + + let(:config_yaml) { YAML.load_stream(catalogue.resource('file', '/etc/kubernetes/config.yaml').send(:parameters)[:content]) } + + it 'has scheduler extra arguments' do + cluster_config = config_yaml.find { |c| c['kind'] == 'ClusterConfiguration' } + expect(cluster_config['scheduler']['extraArgs']['bind-address']).to eq('0.0.0.0') + end + end end