diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 91688f86a54893805a8f6e8eb4197a00c4b220f2_R0lUTEFCX0tBU19WRVJTSU9O..f6a69b05458ce14074901b36ad4cb1fe06693f87_R0lUTEFCX0tBU19WRVJTSU9O 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1,1 +1,1 @@ -13.6.1 \ No newline at end of file +13.7.0 \ No newline at end of file diff --git a/changelogs/unreleased/ash2k-kas-13-7-0.yml b/changelogs/unreleased/ash2k-kas-13-7-0.yml new file mode 100644 index 0000000000000000000000000000000000000000..f6a69b05458ce14074901b36ad4cb1fe06693f87_Y2hhbmdlbG9ncy91bnJlbGVhc2VkL2FzaDJrLWthcy0xMy03LTAueW1s --- /dev/null +++ b/changelogs/unreleased/ash2k-kas-13-7-0.yml @@ -0,0 +1,5 @@ +--- +title: Update gitlab-kas to v13.7.0 +merge_request: 4817 +author: +type: changed diff --git a/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb b/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb index 91688f86a54893805a8f6e8eb4197a00c4b220f2_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIta2FzL3RlbXBsYXRlcy9kZWZhdWx0L2dpdGxhYi1rYXMtY29uZmlnLnltbC5lcmI=..f6a69b05458ce14074901b36ad4cb1fe06693f87_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIta2FzL3RlbXBsYXRlcy9kZWZhdWx0L2dpdGxhYi1rYXMtY29uZmlnLnltbC5lcmI= 100644 --- a/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb +++ b/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb @@ -1,4 +1,8 @@ agent: + listen: + address: <%= @listen_address %> + network: <%= @listen_network %> + websocket: <%= @listen_websocket %> configuration: poll_period: <%= @agent_configuration_poll_period %>s gitops: @@ -10,9 +14,5 @@ gitlab: address: <%= @gitlab_address %> authentication_secret_file: <%= @authentication_secret_file %> -listen_agent: - address: <%= @listen_address %> - network: <%= @listen_network %> - websocket: <%= @listen_websocket %> observability: usage_reporting_period: <%= @metrics_usage_reporting_period %>s diff --git a/spec/chef/recipes/gitlab-kas_spec.rb b/spec/chef/recipes/gitlab-kas_spec.rb index 91688f86a54893805a8f6e8eb4197a00c4b220f2_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLWthc19zcGVjLnJi..f6a69b05458ce14074901b36ad4cb1fe06693f87_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLWthc19zcGVjLnJi 100644 --- a/spec/chef/recipes/gitlab-kas_spec.rb +++ b/spec/chef/recipes/gitlab-kas_spec.rb @@ -35,8 +35,8 @@ end it 'correctly renders the KAS config file' do - expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ address: localhost:8150}) - expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ websocket: true}) + expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ address: localhost:8150}) + expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ websocket: true}) expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ usage_reporting_period: 60s}) end @@ -68,8 +68,8 @@ end it 'correctly renders the KAS config file' do - expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ address: localhost:5006}) - expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ websocket: false}) + expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ address: localhost:5006}) + expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ websocket: false}) expect(chef_run).to render_file('/var/opt/gitlab/gitlab-kas/gitlab-kas-config.yml').with_content(%r{^ usage_reporting_period: 120s}) end