Skip to content

Commit abbf310

Browse files
authored
chore(charts)!: remove couchbase support from Helm charts (#1886)
* chore(charts)!: remove couchbase support from Helm charts Signed-off-by: iromli <[email protected]> * chore(charts)!: remove couchbase support from Rancher Signed-off-by: iromli <[email protected]> * docs: remove couchbase section in cloud installation Signed-off-by: iromli <[email protected]> --------- Signed-off-by: iromli <[email protected]>
1 parent 94243a9 commit abbf310

File tree

31 files changed

+35
-437
lines changed

31 files changed

+35
-437
lines changed

automation/rancher-partner-charts/questions.yaml

+1-67
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,8 @@ questions:
177177
type: enum
178178
group: "Persistence"
179179
label: Gluu Persistence backend
180-
description: "Persistence backend to run Gluu with couchbase|hybrid|sql"
180+
description: "Persistence backend to run Gluu with hybrid|sql"
181181
options:
182-
- "couchbase"
183182
- "hybrid"
184183
- "sql"
185184
# Hybrid
@@ -249,70 +248,6 @@ questions:
249248
type: string
250249
label: SQL database name
251250
show_if: "global.cnPersistenceType=sql"
252-
#Couchbase
253-
- variable: config.configmap.cnCouchbaseCrt
254-
default: ""
255-
group: "Persistence"
256-
description: "Couchbase certificate authority string. This must be encoded using base64. This can also be found in your couchbase UI Security > Root Certificate. In mTLS setups this is not required."
257-
type: multiline
258-
label: Couchbase certificate authority string
259-
show_if: "global.cnPersistenceType=couchbase||global.cnPersistenceType=hybrid"
260-
- variable: config.configmap.cnCouchbaseUrl
261-
default: "gluu.cbns.svc.cluster.local"
262-
required: false
263-
type: hostname
264-
group: "Persistence"
265-
label: Couchbase host uri
266-
description: "Couchbase URL. Used only when global.cnPersistenceType is hybrid or couchbase. This should be in FQDN format for either remote or local Couchbase clusters. The address can be an internal address inside the kubernetes cluster"
267-
show_if: "global.cnPersistenceType=couchbase||global.cnPersistenceType=hybrid"
268-
- variable: config.configmap.cnCouchbaseBucketPrefix
269-
default: "gluu"
270-
type: string
271-
description: "The prefix of couchbase buckets. This helps with separation in between different environments and allows for the same couchbase cluster to be used by different setups of Gluu."
272-
group: "Persistence"
273-
required: true
274-
label: The prefix of Couchbase buckets
275-
show_if: "global.cnPersistenceType=couchbase||global.cnPersistenceType=hybrid"
276-
- variable: config.configmap.cnCouchbaseIndexNumReplica
277-
default: 0
278-
type: int
279-
description: "The number of replicas per index created. Please note that the number of index nodes must be one greater than the number of index replicas. That means if your couchbase cluster only has 2 index nodes you cannot place the number of replicas to be higher than 1."
280-
group: "Persistence"
281-
required: true
282-
label: The number of replicas per index created
283-
show_if: "global.cnPersistenceType=couchbase||global.cnPersistenceType=hybrid"
284-
- variable: config.configmap.cnCouchbaseSuperUser
285-
default: "admin"
286-
group: "Persistence"
287-
description: "he Couchbase super user (admin) user name. This user is used during initialization only."
288-
type: string
289-
label: The Couchbase super user (admin) user name.
290-
valid_chars: "^[a-z]+$"
291-
show_if: "global.cnPersistenceType=couchbase||global.cnPersistenceType=hybrid"
292-
- variable: config.configmap.cnCouchbaseSuperUserPassword
293-
default: "Test1234#"
294-
group: "Persistence"
295-
description: "Couchbase password for the super user config.configmap.cnCouchbaseSuperUser that is used during the initialization and upgrade process. The password must contain one digit, one uppercase letter, one lower case letter and one symbol"
296-
type: password
297-
label: Couchbase password for the super users
298-
299-
show_if: "global.cnPersistenceType=couchbase||global.cnPersistenceType=hybrid"
300-
- variable: config.configmap.cnCouchbaseUser
301-
default: "gluu"
302-
group: "Persistence"
303-
description: "Couchbase restricted user, used in Gluu operations with Couchbase. Used only when global.cnPersistenceType is hybrid or couchbase."
304-
type: string
305-
label: Couchbase restricted username
306-
valid_chars: "^[a-z]+$"
307-
show_if: "global.cnPersistenceType=couchbase||global.cnPersistenceType=hybrid"
308-
- variable: config.configmap.cnCouchbasePassword
309-
default: "Test1234#"
310-
group: "Persistence"
311-
description: "Couchbase password for the restricted user config.configmap.cnCouchbaseUser that is often used inside the services. The password must contain one digit, one uppercase letter, one lower case letter and one symbol ."
312-
type: password
313-
label: Couchbase password for the restricted user
314-
show_if: "global.cnPersistenceType=couchbase||global.cnPersistenceType=hybrid"
315-
316251
# ===========
317252
# Cache group
318253
# ===========
@@ -433,7 +368,6 @@ questions:
433368
description: "Migration data-format depending on persistence backend."
434369
options:
435370
- "ldif"
436-
- "couchbase+json"
437371
- "postgresql+json"
438372
- "mysql+json"
439373
- variable: config.migration.migrationDir

charts/gluu-all-in-one/README.md

+1-11
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,9 @@ Kubernetes: `>=v1.22.0-0`
142142
| cnConfiguratorCustomSchema | object | `{"secretName":""}` | Use custom configuration schema in existing secrets. Note, the secrets has to contain the key configuration.json or any basename as specified in cnConfiguratorConfigurationFile. |
143143
| cnConfiguratorCustomSchema.secretName | string | `""` | The name of the secrets used for storing custom configuration schema. |
144144
| cnConfiguratorDumpFile | string | `"/etc/jans/conf/configuration.out.json"` | Path to dumped configuration schema file |
145-
| cnCouchbasePasswordFile | string | `"/etc/jans/conf/couchbase_password"` | Path to Couchbase password file |
146-
| cnCouchbaseSuperuserPasswordFile | string | `"/etc/jans/conf/couchbase_superuser_password"` | Path to Couchbase superuser password file |
147145
| cnDocumentStoreType | string | `"DB"` | Document store type to use for shibboleth files DB. |
148146
| cnGoogleApplicationCredentials | string | `"/etc/jans/conf/google-credentials.json"` | Base64 encoded service account. The sa must have roles/secretmanager.admin to use Google secrets. Leave as this is a sensible default. |
149-
| cnPersistenceType | string | `"sql"` | Persistence backend to run Gluu with couchbase|hybrid|sql. |
147+
| cnPersistenceType | string | `"sql"` | Persistence backend to run Gluu with hybrid|sql. |
150148
| cnPrometheusPort | string | `""` | Port used by Prometheus JMX agent (default to empty string). To enable Prometheus JMX agent, set the value to a number. |
151149
| cnSqlPasswordFile | string | `"/etc/jans/conf/sql_password"` | Path to SQL password file |
152150
| config-api.appLoggers | object | `{"adminUiAppLoggers":{"adminUiAuditLogLevel":"INFO","adminUiAuditLogTarget":"FILE","adminUiLogLevel":"INFO","adminUiLogTarget":"FILE","enableStdoutLogPrefix":"true"},"configApiLogLevel":"INFO","configApiLogTarget":"STDOUT","enableStdoutLogPrefix":"true","persistenceDurationLogLevel":"INFO","persistenceDurationLogTarget":"FILE","persistenceLogLevel":"INFO","persistenceLogTarget":"FILE","scriptLogLevel":"INFO","scriptLogTarget":"FILE"}` | App loggers can be configured to define where the logs will be redirected to and the level of each in which it should be displayed. |
@@ -182,14 +180,6 @@ Kubernetes: `>=v1.22.0-0`
182180
| configmap.cnAwsSecretsReplicaRegions | list | `[]` | |
183181
| configmap.cnCacheType | string | `"NATIVE_PERSISTENCE"` | Cache type. `NATIVE_PERSISTENCE`, `REDIS`. or `IN_MEMORY`. Defaults to `NATIVE_PERSISTENCE` . |
184182
| configmap.cnConfigKubernetesConfigMap | string | `"cn"` | The name of the Kubernetes ConfigMap that will hold the configuration layer |
185-
| configmap.cnCouchbaseBucketPrefix | string | `"jans"` | The prefix of couchbase buckets. This helps with separation in between different environments and allows for the same couchbase cluster to be used by different setups of Gluu. |
186-
| configmap.cnCouchbaseCrt | string | `"SWFtTm90YVNlcnZpY2VBY2NvdW50Q2hhbmdlTWV0b09uZQo="` | Couchbase certificate authority string. This must be encoded using base64. This can also be found in your couchbase UI Security > Root Certificate. In mTLS setups this is not required. |
187-
| configmap.cnCouchbaseIndexNumReplica | int | `0` | The number of replicas per index created. Please note that the number of index nodes must be one greater than the number of index replicas. That means if your couchbase cluster only has 2 index nodes you cannot place the number of replicas to be higher than 1. |
188-
| configmap.cnCouchbasePassword | string | `"P@ssw0rd"` | Couchbase password for the restricted user config.configmap.cnCouchbaseUser that is often used inside the services. The password must contain one digit, one uppercase letter, one lower case letter and one symbol . |
189-
| configmap.cnCouchbaseSuperUser | string | `"admin"` | The Couchbase super user (admin) username. This user is used during initialization only. |
190-
| configmap.cnCouchbaseSuperUserPassword | string | `"Test1234#"` | Couchbase password for the superuser config.configmap.cnCouchbaseSuperUser that is used during the initialization process. The password must contain one digit, one uppercase letter, one lower case letter and one symbol |
191-
| configmap.cnCouchbaseUrl | string | `"cbgluu.default.svc.cluster.local"` | Couchbase URL. Used only when cnPersistenceType is hybrid or couchbase. This should be in FQDN format for either remote or local Couchbase clusters. The address can be an internal address inside the kubernetes cluster |
192-
| configmap.cnCouchbaseUser | string | `"gluu"` | Couchbase restricted user. Used only when cnPersistenceType is hybrid or couchbase. |
193183
| configmap.cnGoogleProjectId | string | `"google-project-to-save-config-and-secrets-to"` | Project id of the Google project the secret manager belongs to. Used only when configAdapterName and configSecretAdapter is set to google. |
194184
| configmap.cnGoogleSecretManagerServiceAccount | string | `"SWFtTm90YVNlcnZpY2VBY2NvdW50Q2hhbmdlTWV0b09uZQo="` | Service account with roles roles/secretmanager.admin base64 encoded string. This is used often inside the services to reach the configuration layer. Used only when configAdapterName and configSecretAdapter is set to google. |
195185
| configmap.cnGoogleSecretNamePrefix | string | `"gluu"` | Prefix for Gluu secret in Google Secret Manager. Defaults to gluu. If left janssen-secret secret will be created. Used only when configAdapterName and configSecretAdapter is set to google. |

charts/gluu-all-in-one/templates/_helpers.tpl

-3
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ Create optional scopes list
7575
{{- if eq .Values.configmap.cnCacheType "REDIS" }}
7676
{{ $newList = append $newList ("redis" | quote ) }}
7777
{{- end}}
78-
{{ if or (eq .Values.cnPersistenceType "couchbase") (eq .Values.cnPersistenceType "hybrid") }}
79-
{{ $newList = append $newList ("couchbase" | quote) }}
80-
{{- end}}
8178
{{ if eq .Values.cnPersistenceType "sql" }}
8279
{{ $newList = append $newList ("sql" | quote) }}
8380
{{- end }}

charts/gluu-all-in-one/templates/configmap.yaml

-13
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,6 @@ data:
114114
LB_ADDR: {{ .Values.configmap.lbAddr }}
115115
{{- end }}
116116
CN_PERSISTENCE_TYPE: {{ .Values.cnPersistenceType }}
117-
{{- if or (eq .Values.cnPersistenceType "couchbase") (eq .Values.cnPersistenceType "hybrid") }}
118-
# used only if CN_PERSISTENCE_TYPE is couchbase or hybrid
119-
CN_COUCHBASE_URL: {{ .Values.configmap.cnCouchbaseUrl }}
120-
CN_COUCHBASE_BUCKET_PREFIX: {{ .Values.configmap.cnCouchbaseBucketPrefix }}
121-
CN_COUCHBASE_INDEX_NUM_REPLICA: {{ .Values.configmap.cnCouchbaseIndexNumReplica | quote }}
122-
CN_COUCHBASE_USER: {{ .Values.configmap.cnCouchbaseUser }}
123-
CN_COUCHBASE_SUPERUSER: {{ .Values.configmap.cnCouchbaseSuperUser }}
124-
{{- end }}
125117
CN_KEY_ROTATION_FORCE: "false"
126118
CN_KEY_ROTATION_CHECK: "3600"
127119
CN_KEY_ROTATION_INTERVAL: "48"
@@ -141,9 +133,6 @@ data:
141133
CN_REDIS_SSL_TRUSTSTORE: {{ .Values.configmap.cnRedisSslTruststore | quote }}
142134
CN_REDIS_SENTINEL_GROUP: {{ .Values.configmap.cnRedisSentinelGroup | quote }}
143135
{{- end }}
144-
{{- if .Values.istio.enabled }}
145-
CN_COUCHBASE_TRUSTSTORE_ENABLE: "false"
146-
{{- end }}
147136
{{- if .Values.scim.enabled }}
148137
CN_SCIM_ENABLED: {{ .Values.scim.enabled | quote }}
149138
CN_SCIM_PROTECTION_MODE: {{ .Values.configmap.cnScimProtectionMode | quote }}
@@ -188,8 +177,6 @@ data:
188177
}}
189178
{{- end }}
190179
CN_SQL_PASSWORD_FILE: {{ .Values.cnSqlPasswordFile }}
191-
CN_COUCHBASE_PASSWORD_FILE: {{ .Values.cnCouchbasePasswordFile }}
192-
CN_COUCHBASE_SUPERUSER_PASSWORD_FILE: {{ .Values.cnCouchbaseSuperuserPasswordFile }}
193180
CN_CONFIG_API_PLUGINS: "admin-ui,fido2,scim,user-mgt"
194181
CN_AIO_COMPONENTS: {{ include "flex-all-in-one.aioComponents" . | fromJsonArray | join "," | quote}}
195182
{{- if .Values.saml.enabled }}

charts/gluu-all-in-one/templates/secret.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ stringData:
4242
{{ if or ( eq .Values.cnPersistenceType "sql" ) ( eq .Values.cnPersistenceType "hybrid" ) }}
4343
"sql_password": {{ .Values.configmap.cnSqldbUserPassword | quote }},
4444
{{- end }}
45-
{{ if or ( eq .Values.cnPersistenceType "couchbase" ) ( eq .Values.cnPersistenceType "hybrid" ) }}
46-
"couchbase_password": {{ .Values.configmap.cnCouchbasePassword | quote }},
47-
"couchbase_superuser_password": {{ .Values.configmap.cnCouchbaseSuperUserPassword | quote }},
48-
"couchbase_cert": {{ .Values.configmap.cnCouchbaseCrt | quote }},
49-
{{- end }}
5045
{{ if eq .Values.configSecretAdapter "vault" }}
5146
"vault_role_id": {{ .Values.configmap.cnVaultRoleId | quote }},
5247
"vault_secret_id": {{ .Values.configmap.cnVaultSecretId | quote }},

charts/gluu-all-in-one/values.yaml

+1-21
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ orgName: Gluu
1414
# -- Resource specs.
1515
# -- State code. Used for certificate creation.
1616
state: TX
17-
# -- Persistence backend to run Gluu with couchbase|hybrid|sql.
17+
# -- Persistence backend to run Gluu with hybrid|sql.
1818
cnPersistenceType: sql
1919
# -- Salt. Used for encoding/decoding sensitive data. If omitted or set to empty string, the value will be self-generated. Otherwise, a 24 alphanumeric characters are allowed as its value.
2020
salt: ""
@@ -58,22 +58,6 @@ configmap:
5858
containerMetadataName: kubernetes
5959
# -- The name of the Kubernetes ConfigMap that will hold the configuration layer
6060
cnConfigKubernetesConfigMap: cn
61-
# -- The prefix of couchbase buckets. This helps with separation in between different environments and allows for the same couchbase cluster to be used by different setups of Gluu.
62-
cnCouchbaseBucketPrefix: jans
63-
# -- Couchbase certificate authority string. This must be encoded using base64. This can also be found in your couchbase UI Security > Root Certificate. In mTLS setups this is not required.
64-
cnCouchbaseCrt: SWFtTm90YVNlcnZpY2VBY2NvdW50Q2hhbmdlTWV0b09uZQo=
65-
# -- The number of replicas per index created. Please note that the number of index nodes must be one greater than the number of index replicas. That means if your couchbase cluster only has 2 index nodes you cannot place the number of replicas to be higher than 1.
66-
cnCouchbaseIndexNumReplica: 0
67-
# -- Couchbase password for the restricted user config.configmap.cnCouchbaseUser that is often used inside the services. The password must contain one digit, one uppercase letter, one lower case letter and one symbol .
68-
cnCouchbasePassword: P@ssw0rd
69-
# -- The Couchbase super user (admin) username. This user is used during initialization only.
70-
cnCouchbaseSuperUser: admin
71-
# -- Couchbase password for the superuser config.configmap.cnCouchbaseSuperUser that is used during the initialization process. The password must contain one digit, one uppercase letter, one lower case letter and one symbol
72-
cnCouchbaseSuperUserPassword: Test1234#
73-
# -- Couchbase URL. Used only when cnPersistenceType is hybrid or couchbase. This should be in FQDN format for either remote or local Couchbase clusters. The address can be an internal address inside the kubernetes cluster
74-
cnCouchbaseUrl: cbgluu.default.svc.cluster.local
75-
# -- Couchbase restricted user. Used only when cnPersistenceType is hybrid or couchbase.
76-
cnCouchbaseUser: gluu
7761
# [google_envs] Envs related to using Google
7862
# -- Service account with roles roles/secretmanager.admin base64 encoded string. This is used often inside the services to reach the configuration layer. Used only when configAdapterName and configSecretAdapter is set to google.
7963
cnGoogleSecretManagerServiceAccount: SWFtTm90YVNlcnZpY2VBY2NvdW50Q2hhbmdlTWV0b09uZQo=
@@ -593,10 +577,6 @@ cnPrometheusPort: ""
593577
cnDocumentStoreType: DB
594578
# -- Path to SQL password file
595579
cnSqlPasswordFile: /etc/jans/conf/sql_password
596-
# -- Path to Couchbase password file
597-
cnCouchbasePasswordFile: /etc/jans/conf/couchbase_password
598-
# -- Path to Couchbase superuser password file
599-
cnCouchbaseSuperuserPasswordFile: /etc/jans/conf/couchbase_superuser_password
600580
# -- Path to file contains password for database access
601581
kcDbPasswordFile: /etc/jans/conf/kc_db_password
602582
# -- Path to file contains Keycloak admin credentials (username and password)

0 commit comments

Comments
 (0)