diff options
author | Vladimir Shushlin <vshushlin@gitlab.com> | 2021-02-09 12:31:57 +0300 |
---|---|---|
committer | Vladimir Shushlin <vshushlin@gitlab.com> | 2021-02-09 12:31:57 +0300 |
commit | 786b2185011fcb365bcf7b0b5b7b1c9355c064bf (patch) | |
tree | 3e85ceb3262003029caf1266cb67a799801ebddd | |
parent | 4f07314b781e387183b29dff7d7ad62b9c111f26 (diff) | |
parent | 795e446eb004975057fae6cbe51bfc76d22232ec (diff) |
Merge branch 'deprecate-domain-config-source' into 'master'
Add deprecation note for domain-config-source
See merge request gitlab-org/gitlab-pages!433
-rw-r--r-- | internal/source/domains.go | 2 | ||||
-rw-r--r-- | main.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/internal/source/domains.go b/internal/source/domains.go index cf81fab2..5254c3b8 100644 --- a/internal/source/domains.go +++ b/internal/source/domains.go @@ -22,6 +22,8 @@ type configSource int const ( sourceGitlab configSource = iota + // Disk source is deprecated and support will be removed in 14.0 + // https://gitlab.com/gitlab-org/gitlab-pages/-/issues/382 sourceDisk sourceAuto ) @@ -69,7 +69,7 @@ var ( gitlabClientHTTPTimeout = flag.Duration("gitlab-client-http-timeout", 10*time.Second, "GitLab API HTTP client connection timeout in seconds (default: 10s)") gitlabClientJWTExpiry = flag.Duration("gitlab-client-jwt-expiry", 30*time.Second, "JWT Token expiry time in seconds (default: 30s)") // TODO: implement functionality for disk, auto and gitlab https://gitlab.com/gitlab-org/gitlab/-/issues/217912 - domainConfigSource = flag.String("domain-config-source", "auto", "Domain configuration source 'disk', 'auto' or 'gitlab' (default: 'auto')") + domainConfigSource = flag.String("domain-config-source", "auto", "Domain configuration source 'disk', 'auto' or 'gitlab' (default: 'auto'). DEPRECATED: gitlab-pages will use the API-based configuration starting from 14.0 see https://gitlab.com/gitlab-org/gitlab-pages/-/issues/382") clientID = flag.String("auth-client-id", "", "GitLab application Client ID") clientSecret = flag.String("auth-client-secret", "", "GitLab application Client Secret") redirectURI = flag.String("auth-redirect-uri", "", "GitLab application redirect URI") |