From 10677e527b15b8cb7da16654979e5ccfd8929de9 Mon Sep 17 00:00:00 2001 From: Mikael Vanhemert Date: Mon, 18 Dec 2023 12:10:01 -0700 Subject: [PATCH] Remove superfluous IDAM baggage --- README.md | 2 -- docs/idam.md | 19 ------------------- values/gitlab-values.yaml | 11 +---------- zarf.yaml | 19 ------------------- 4 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 docs/idam.md diff --git a/README.md b/README.md index 4394e055..ec3f1aea 100644 --- a/README.md +++ b/README.md @@ -104,5 +104,3 @@ make build/uds-capability-gitlab ``` ## Documentation - -[Identity and Access Management](docs/idam.md) diff --git a/docs/idam.md b/docs/idam.md deleted file mode 100644 index ef3b02ab..00000000 --- a/docs/idam.md +++ /dev/null @@ -1,19 +0,0 @@ -# IDAM integration with uds-capability-gitlab - -This gitlab capability is preconfigured to work with an IDAM solution, but IDAM is disabled by default. - -## IDAM Variables - -These Zarf variables are mapped to gitlab helm chart values that are documented [here.](https://docs.gitlab.com/charts/charts/globals#omniauth) - -| Key | Type | Default | Description | -|--------------------------------|:---------------:|:-------:|----------------------------------------------------------------------------------------------------------| -| GITLAB_IDAM_ENABLED | bool | `false` | Enables/disables IDAM | -| GITLAB_IDAM_ALLOWED_SSOS | list | `[]` | Enables auto creation of accounts when signing in with OmniAuth | -| GITLAB_IDAM_BLOCK_AUTO_USERS | bool | `false` | Enables/disables auto created users being blocked by default | -| GITLAB_IDAM_AUTO_LINK_USER | string | `""` | Allows users authenticating via an OmniAuth provider to be automatically linked to a current GitLab user | -| GITLAB_IDAM_AUTO_SIGNIN | string | `""` | Single provider name allowed to automatically sign in | -| GITLAB_IDAM_EXTERNAL_PROVIDERS | list | `[]` | Define which OmniAuth providers you want to be external | -| GITLAB_IDAM_PROVIDERS | multi-line list | `[]` | [See documentation](https://docs.gitlab.com/charts/charts/globals#providers) | -| GITLAB_IDAM_SYNC_ATTRIBUTES | list | `[]` | List of profile attributes to sync from the provider upon login | -| GITLAB_IDAM_SYNC_PROVIDERS | list | `[]` | List of provider names that GitLab should automatically sync profile information from | diff --git a/values/gitlab-values.yaml b/values/gitlab-values.yaml index 6e0f0277..dc80aa49 100644 --- a/values/gitlab-values.yaml +++ b/values/gitlab-values.yaml @@ -66,16 +66,7 @@ global: tmpBucket: uds-gitlab-tmp###ZARF_VAR_BUCKET_SUFFIX### ## https://docs.gitlab.com/charts/charts/globals#omniauth omniauth: - enabled: ###ZARF_VAR_GITLAB_IDAM_ENABLED### - autoSignInWithProvider: ###ZARF_VAR_GITLAB_IDAM_AUTO_SIGNIN### - syncProfileFromProvider: ###ZARF_VAR_GITLAB_IDAM_SYNC_PROVIDERS### - syncProfileAttributes: ###ZARF_VAR_GITLAB_IDAM_SYNC_ATTRIBUTES### - allowSingleSignOn: ###ZARF_VAR_GITLAB_IDAM_ALLOWED_SSOS### - blockAutoCreatedUsers: ###ZARF_VAR_GITLAB_IDAM_BLOCK_AUTO_USERS### - autoLinkUser: ###ZARF_VAR_GITLAB_IDAM_AUTO_LINK_USER### - externalProviders: ###ZARF_VAR_GITLAB_IDAM_EXTERNAL_PROVIDERS### - providers: - ###ZARF_VAR_GITLAB_IDAM_PROVIDERS### + enabled: false initialDefaults: signupEnabled: ###ZARF_VAR_GITLAB_SIGNUP_ENABLED### diff --git a/zarf.yaml b/zarf.yaml index 65a5fe7a..63116ef2 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -15,25 +15,6 @@ variables: default: "gitlab-redis" - name: GITLAB_REDIS_SCHEME default: "redis" - - name: GITLAB_IDAM_ENABLED - default: "false" - - name: GITLAB_IDAM_ALLOWED_SSOS - default: "[]" - - name: GITLAB_IDAM_BLOCK_AUTO_USERS - default: "false" - - name: GITLAB_IDAM_AUTO_LINK_USER - default: "[]" - - name: GITLAB_IDAM_AUTO_SIGNIN - default: "" - - name: GITLAB_IDAM_EXTERNAL_PROVIDERS - default: "[]" - - name: GITLAB_IDAM_PROVIDERS - default: "[]" - autoIndent: true - - name: GITLAB_IDAM_SYNC_ATTRIBUTES - default: "[]" - - name: GITLAB_IDAM_SYNC_PROVIDERS - default: "[]" - name: GITLAB_DB_NAME default: "gitlabdb" - name: GITLAB_DB_USERNAME