Skip to content

Commit 396c903

Browse files
authored
Ensure correct scheduler extra arguments passed to v1beta3 template (#670)
* Ensure correct scheduler extra arguments passed to v1beta3 template * Add unit tests for scheduler extra arguments
1 parent 7bebd70 commit 396c903

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

Diff for: spec/classes/config/kubeadm_spec.rb

+16
Original file line numberDiff line numberDiff line change
@@ -600,4 +600,20 @@
600600
.with_content(%r{key: node-role.kubernetes.io/control-plane\n})
601601
}
602602
end
603+
604+
context 'when scheduler_extra_arguments is defined' do
605+
let(:params) do
606+
{
607+
'kubernetes_version' => '1.26.0',
608+
'scheduler_extra_arguments' => ['bind-address: 0.0.0.0']
609+
}
610+
end
611+
612+
let(:config_yaml) { YAML.load_stream(catalogue.resource('file', '/etc/kubernetes/config.yaml').send(:parameters)[:content]) }
613+
614+
it 'has scheduler extra arguments' do
615+
cluster_config = config_yaml.find { |c| c['kind'] == 'ClusterConfiguration' }
616+
expect(cluster_config['scheduler']['extraArgs']['bind-address']).to eq('0.0.0.0')
617+
end
618+
end
603619
end

Diff for: templates/v1beta3/config_kubeadm.yaml.erb

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ controllerManager:
8484
<%- end -%>
8585
<%- end -%>
8686
scheduler:
87-
<%- if @scheduler_merged_extra_arguments -%>
87+
<%- if @scheduler_extra_arguments -%>
8888
extraArgs:
89-
<%- @scheduler_merged_extra_arguments.each do |arg| -%>
89+
<%- @scheduler_extra_arguments.each do |arg| -%>
9090
<%= arg %>
9191
<%- end -%>
9292
<%- end -%>

0 commit comments

Comments
 (0)