Skip to content

Commit

Permalink
Add support for the gitlab_kas configuration hash. (#385)
Browse files Browse the repository at this point in the history
Co-authored-by: Rabie Zamane Abou-Taleb <[email protected]>
Co-authored-by: Romain Tartière <[email protected]>
  • Loading branch information
3 people authored Jun 5, 2021
1 parent fa3406f commit c2868fc
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 0 deletions.
8 changes: 8 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,14 @@ Hash of 'gitlab_ci' config parameters.

Default value: ``undef``


##### `gitlab_kas`

Data type: `Optional[Hash]`

Hash of 'gitlab_kas' config parameters.

Default value: ``undef``
##### `gitlab_pages`

Data type: `Optional[Hash]`
Expand Down
2 changes: 2 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
# @param git_data_dirs Hash of git data directories
# @param gitlab_git_http_server Hash of 'gitlab_git_http_server' config parameters.
# @param gitlab_ci Hash of 'gitlab_ci' config parameters.
# @param gitlab_kas Hash of 'gitlab_kas' config parameters.
# @param gitlab_pages Hash of 'gitlab_pages' config parameters.
# @param gitlab_rails Hash of 'gitlab_pages' config parameters.
# @param gitlab_workhorse Hash of 'gitlab_workhorse' config parameters.
Expand Down Expand Up @@ -128,6 +129,7 @@
Optional[Hash] $git_data_dirs = undef,
Optional[Hash] $gitlab_git_http_server = undef,
Optional[Hash] $gitlab_ci = undef,
Optional[Hash] $gitlab_kas = undef,
Optional[Hash] $gitlab_pages = undef,
Optional[Hash] $gitlab_rails = undef,
Optional[Hash] $grafana = undef,
Expand Down
1 change: 1 addition & 0 deletions manifests/omnibus_config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
$git_data_dirs = $gitlab::git_data_dirs
$gitlab_git_http_server = $gitlab::gitlab_git_http_server
$gitlab_ci = $gitlab::gitlab_ci
$gitlab_kas = $gitlab::gitlab_kas
$gitlab_pages = $gitlab::gitlab_pages
$gitlab_rails = $gitlab::gitlab_rails
$grafana = $gitlab::grafana
Expand Down
10 changes: 10 additions & 0 deletions templates/gitlab.rb.erb
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,16 @@ registry['<%= k -%>'] = <%= decorate(@registry[k]) %>
<%- @gitlab_ci.keys.sort.each do |k| -%>
gitlab_ci['<%= k -%>'] = <%= decorate(@gitlab_ci[k]) %>
<%- end end -%>
<%- if @gitlab_kas -%>

##############
# GitLab KAS #
##############
## see: gitlab kubernetes-agent settings

<%- @gitlab_kas.keys.sort.each do |k| -%>
gitlab_kas['<%= k -%>'] = <%= decorate(@gitlab_kas[k]) %>
<%- end end -%>
<%- if @ci_unicorn -%>

#####################
Expand Down

0 comments on commit c2868fc

Please sign in to comment.