From 61620b0273e8fc5bd1a4f29a1da2b3406d8a02de Mon Sep 17 00:00:00 2001 From: kristofkalocsai Date: Thu, 7 Oct 2021 18:56:05 +0200 Subject: [PATCH 1/5] replaces ERB with gomplate --- charts/gitlab/charts/gitlab-pages/templates/configmap.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/gitlab/charts/gitlab-pages/templates/configmap.yml b/charts/gitlab/charts/gitlab-pages/templates/configmap.yml index 7e55408723..f8b0606cf2 100644 --- a/charts/gitlab/charts/gitlab-pages/templates/configmap.yml +++ b/charts/gitlab/charts/gitlab-pages/templates/configmap.yml @@ -8,7 +8,7 @@ metadata: {{- include "gitlab.commonLabels" . | nindent 4 }} annotations: data: - config.erb: | + config.tpl: | {{- with .Values.gitlabCache }} {{- if .cleanup }} gitlab-cache-cleanup={{ .cleanup }} @@ -95,9 +95,9 @@ data: {{- end }} {{- if eq $.Values.global.pages.accessControl true }} auth-redirect-uri={{ template "oauth.gitlab-pages.authRedirectUri" . }} - auth-client-id=<%= File.read('/etc/gitlab-secrets/pages/gitlab_appid').strip.dump[1..-2] %> - auth-client-secret=<%= File.read('/etc/gitlab-secrets/pages/gitlab_appsecret').strip.dump[1..-2] %> - auth-secret=<%= File.read('/etc/gitlab-secrets/pages/auth_secret').strip.dump[1..-2] %> + auth-client-id={{ file.Read "/etc/gitlab-secrets/pages/gitlab_appid" }} + auth-client-secret={{ file.Read "/etc/gitlab-secrets/pages/gitlab_appsecret" }} + auth-secret={{ file.Read "/etc/gitlab-secrets/pages/auth_secret" }} {{- end }} {{- with .Values.zipCache }} {{- if .cleanup }} -- GitLab From 314005ad6239ea8475e9f70ecc3d16abb99ed73f Mon Sep 17 00:00:00 2001 From: Jason Plum Date: Thu, 7 Oct 2021 18:21:41 +0000 Subject: [PATCH 2/5] of course! --- charts/gitlab/charts/gitlab-pages/templates/configmap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitlab/charts/gitlab-pages/templates/configmap.yml b/charts/gitlab/charts/gitlab-pages/templates/configmap.yml index f8b0606cf2..b2732e11fe 100644 --- a/charts/gitlab/charts/gitlab-pages/templates/configmap.yml +++ b/charts/gitlab/charts/gitlab-pages/templates/configmap.yml @@ -95,7 +95,7 @@ data: {{- end }} {{- if eq $.Values.global.pages.accessControl true }} auth-redirect-uri={{ template "oauth.gitlab-pages.authRedirectUri" . }} - auth-client-id={{ file.Read "/etc/gitlab-secrets/pages/gitlab_appid" }} + auth-client-id={% file.Read "/etc/gitlab-secrets/pages/gitlab_appid" %} auth-client-secret={{ file.Read "/etc/gitlab-secrets/pages/gitlab_appsecret" }} auth-secret={{ file.Read "/etc/gitlab-secrets/pages/auth_secret" }} {{- end }} -- GitLab From d6779a616fc1d1333cd1e051531b4a299c28b75f Mon Sep 17 00:00:00 2001 From: Jason Plum Date: Fri, 8 Oct 2021 19:29:01 +0000 Subject: [PATCH 3/5] again, sorry, thought the original change had all 3 lines covered --- charts/gitlab/charts/gitlab-pages/templates/configmap.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/gitlab/charts/gitlab-pages/templates/configmap.yml b/charts/gitlab/charts/gitlab-pages/templates/configmap.yml index b2732e11fe..3d08d775f2 100644 --- a/charts/gitlab/charts/gitlab-pages/templates/configmap.yml +++ b/charts/gitlab/charts/gitlab-pages/templates/configmap.yml @@ -97,7 +97,8 @@ data: auth-redirect-uri={{ template "oauth.gitlab-pages.authRedirectUri" . }} auth-client-id={% file.Read "/etc/gitlab-secrets/pages/gitlab_appid" %} auth-client-secret={{ file.Read "/etc/gitlab-secrets/pages/gitlab_appsecret" }} - auth-secret={{ file.Read "/etc/gitlab-secrets/pages/auth_secret" }} + auth-client-secret={% file.Read "/etc/gitlab-secrets/pages/gitlab_appsecret" %} + auth-secret={% file.Read "/etc/gitlab-secrets/pages/auth_secret" %} {{- end }} {{- with .Values.zipCache }} {{- if .cleanup }} -- GitLab From ff50c19c6029dc3980ca2f8794dac7e328163e03 Mon Sep 17 00:00:00 2001 From: Jason Plum Date: Fri, 8 Oct 2021 20:13:49 +0000 Subject: [PATCH 4/5] Apply 1 suggestion(s) to 1 file(s) --- charts/gitlab/charts/gitlab-pages/templates/configmap.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/gitlab/charts/gitlab-pages/templates/configmap.yml b/charts/gitlab/charts/gitlab-pages/templates/configmap.yml index 3d08d775f2..21abcaa99d 100644 --- a/charts/gitlab/charts/gitlab-pages/templates/configmap.yml +++ b/charts/gitlab/charts/gitlab-pages/templates/configmap.yml @@ -96,7 +96,6 @@ data: {{- if eq $.Values.global.pages.accessControl true }} auth-redirect-uri={{ template "oauth.gitlab-pages.authRedirectUri" . }} auth-client-id={% file.Read "/etc/gitlab-secrets/pages/gitlab_appid" %} - auth-client-secret={{ file.Read "/etc/gitlab-secrets/pages/gitlab_appsecret" }} auth-client-secret={% file.Read "/etc/gitlab-secrets/pages/gitlab_appsecret" %} auth-secret={% file.Read "/etc/gitlab-secrets/pages/auth_secret" %} {{- end }} -- GitLab From 45baa699fc5c3de4ff181ad8053dd570dc68667a Mon Sep 17 00:00:00 2001 From: kristofkalocsai Date: Thu, 14 Oct 2021 22:17:21 +0200 Subject: [PATCH 5/5] updates paths in page_spec Changelog: fixed --- spec/configuration/pages_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/configuration/pages_spec.rb b/spec/configuration/pages_spec.rb index 0795c4cc83..bfdd537a19 100644 --- a/spec/configuration/pages_spec.rb +++ b/spec/configuration/pages_spec.rb @@ -412,7 +412,7 @@ describe 'GitLab Pages' do describe 'Pages configuration file' do subject(:config_data) do - pages_enabled_template.dig('ConfigMap/test-gitlab-pages', 'data', 'config.erb') + pages_enabled_template.dig('ConfigMap/test-gitlab-pages', 'data', 'config.tpl') end context 'default values with Pages enabled' do @@ -515,9 +515,9 @@ describe 'GitLab Pages' do tls-min-version=tls1.0 tls-max-version=tls1.2 auth-redirect-uri=https://projects.pages.example.com/auth - auth-client-id=<%= File.read('/etc/gitlab-secrets/pages/gitlab_appid').strip.dump[1..-2] %> - auth-client-secret=<%= File.read('/etc/gitlab-secrets/pages/gitlab_appsecret').strip.dump[1..-2] %> - auth-secret=<%= File.read('/etc/gitlab-secrets/pages/auth_secret').strip.dump[1..-2] %> + auth-client-id={% file.Read "/etc/gitlab-secrets/pages/gitlab_appid" %} + auth-client-secret={% file.Read "/etc/gitlab-secrets/pages/gitlab_appsecret" %} + auth-secret={% file.Read "/etc/gitlab-secrets/pages/auth_secret" %} zip-cache-refresh=60s MSG @@ -533,7 +533,7 @@ describe 'GitLab Pages' do end subject(:pages_config_data) do - pages_enabled_template.dig('ConfigMap/test-gitlab-pages', 'data', 'config.erb') + pages_enabled_template.dig('ConfigMap/test-gitlab-pages', 'data', 'config.tpl') end context 'when not enabled' do -- GitLab