Skip to content
Snippets Groups Projects
Commit 38eb4c1289b7 authored by Thong Kuah's avatar Thong Kuah
Browse files

Update kas config yaml for breaking config changes

- listen -> listen_agent
- metrics -> observability
parent 46aae88b6eb3
1 merge request!24Bumping heptapod-stable for 0.19
......@@ -10,7 +10,7 @@
gitlab:
address: <%= @gitlab_address %>
authentication_secret_file: <%= @authentication_secret_file %>
listen:
listen_agent:
address: <%= @listen_address %>
network: <%= @listen_network %>
websocket: <%= @listen_websocket %>
......@@ -14,5 +14,5 @@
address: <%= @listen_address %>
network: <%= @listen_network %>
websocket: <%= @listen_websocket %>
metrics:
observability:
usage_reporting_period: <%= @metrics_usage_reporting_period %>s
......@@ -37,6 +37,7 @@
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{^ usage_reporting_period: 60s})
end
it 'correctly renders the KAS authentication secret file' do
......@@ -52,7 +53,8 @@
api_secret_key: 'QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUE=',
enable: true,
listen_address: 'localhost:5006',
listen_websocket: false
listen_websocket: false,
metrics_usage_reporting_period: '120'
}
)
end
......@@ -68,6 +70,7 @@
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{^ usage_reporting_period: 120s})
end
it 'correctly renders the KAS authentication secret file' do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment