fix: update configmap ENVs

GluuFederation · Jan 31, 2023 · acda6a5 · acda6a5
1 parent c058072
commit acda6a5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 28 deletions.
diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml
@@ -39,11 +39,9 @@ data:
   {{- end }}
   {{ if eq .Values.global.configSecretAdapter "google" }}
   # [google_secret_manager_envs] Envs related to using Google Secret Manager to store config and secret layer
-  CN_SECRET_GOOGLE_SECRET_VERSION_ID: {{ .Values.configmap.cnSecretGoogleSecretVersionId | quote }}
-  CN_SECRET_GOOGLE_SECRET_MANAGER_PASSPHRASE: {{ .Values.configmap.cnGoogleSecretManagerPassPhrase | quote }}
-  CN_SECRET_GOOGLE_SECRET_NAME_PREFIX: {{ .Values.configmap.cnSecretGoogleSecretNamePrefix | quote }}
-  CN_CONFIG_GOOGLE_SECRET_VERSION_ID: {{ .Values.configmap.cnConfigGoogleSecretVersionId | quote }}
-  CN_CONFIG_GOOGLE_SECRET_NAME_PREFIX: {{ .Values.configmap.cnConfigGoogleSecretNamePrefix | quote }}
+  CN_GOOGLE_SECRET_VERSION_ID: {{ .Values.configmap.cnGoogleSecretVersionId | quote }}
+  CN_GOOGLE_SECRET_MANAGER_PASSPHRASE: {{ .Values.configmap.cnGoogleSecretManagerPassPhrase | quote }}
+  CN_GOOGLE_SECRET_NAME_PREFIX: {{ .Values.configmap.cnGoogleSecretNamePrefix | quote }}
   # [google_secret_manager_envs] END
   {{- end }}
   CN_SQL_DB_SCHEMA: {{ .Values.configmap.cnSqlDbSchema | quote }}

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml
@@ -63,15 +63,11 @@ configmap:
   # [google_spanner_envs] END
   # [google_secret_manager_envs] Envs related to using Google Secret Manager to store config and secret layer
   # -- Secret version to be used for secret configuration. Defaults to latest and should normally always stay that way. Used only when global.configAdapterName and global.configSecretAdapter is set to google.
-  cnSecretGoogleSecretVersionId: "latest"
+  cnGoogleSecretVersionId: "latest"
   # -- Prefix for Gluu secret in Google Secret Manager. Defaults to gluu. If left gluu-secret secret will be created. Used only when global.configAdapterName and global.configSecretAdapter is set to google.
-  cnSecretGoogleSecretNamePrefix: gluu
+  cnGoogleSecretNamePrefix: gluu
   # -- Passphrase for Gluu secret in Google Secret Manager. This is used for encrypting and decrypting data from the Google Secret Manager. Used only when global.configAdapterName and global.configSecretAdapter is set to google.
   cnGoogleSecretManagerPassPhrase: Test1234#
-  # -- Secret version to be used for configuration. Defaults to latest and should normally always stay that way. Used only when global.configAdapterName and global.configSecretAdapter is set to google. Used only when global.configAdapterName and global.configSecretAdapter is set to google.
-  cnConfigGoogleSecretVersionId: "latest"
-  # -- Prefix for Gluu configuration secret in Google Secret Manager. Defaults to gluu. If left intact gluu-configuration secret will be created. Used only when global.configAdapterName and global.configSecretAdapter is set to google.
-  cnConfigGoogleSecretNamePrefix: gluu
   # [google_secret_manager_envs] END
   # [google_envs] END
   # -- OpenDJ internal address. Leave as default. Used when `global.cnPersistenceType` is set to `ldap`.

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/values.schema.json b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/values.schema.json
@@ -158,12 +158,12 @@
                      "type":"string",
                      "pattern":"^[a-z0-9\\-]*$"
                   },
-                  "cnSecretGoogleSecretVersionId":{
+                  "cnGoogleSecretVersionId":{
                      "description":"Secret version to be used for secret configuration. Defaults to latest and should normally always stay that way. Used only when global.configAdapterName and global.configSecretAdapter is set to google.",
                      "type":"string",
                      "pattern":"^([0-9]|latest)*$"
                   },
-                  "cnSecretGoogleSecretNamePrefix":{
+                  "cnGoogleSecretNamePrefix":{
                      "description":"Prefix for Gluu secret in Google Secret Manager. Defaults to gluu. If left gluu-secret secret will be created. Used only when global.configAdapterName and global.configSecretAdapter is set to google.",
                      "type":"string",
                      "pattern":"^[a-z]+$"
@@ -172,15 +172,6 @@
                      "description":"Passphrase for Gluu secret in Google Secret Manager. This is used for encrypting and decrypting data from the Google Secret Manager. Used only when global.configAdapterName and global.configSecretAdapter is set to google.",
                      "$ref":"#/definitions/password"
                   },
-                  "cnConfigGoogleSecretVersionId":{
-                     "description":"Secret version to be used for configuration. Defaults to latest and should normally always stay that way. Used only when global.configAdapterName and global.configSecretAdapter is set to google. Used only when global.configAdapterName and global.configSecretAdapter is set to google.",
-                     "type":"string",
-                     "pattern":"^([0-9]|latest)*$"
-                  },
-                  "cnConfigGoogleSecretNamePrefix":{
-                     "description":"Prefix for Gluu configuration secret in Google Secret Manager. Defaults to gluu. If left intact gluu-configuration secret will be created. Used only when global.configAdapterName and global.configSecretAdapter is set to google.",
-                     "type":"string"
-                  },
                   "cnLdapUrl":{
                      "description":"OpenDJ internal address. Leave as default. Used when `global.cnPersistenceType` is set to `ldap`.",
                      "type":"string",

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/values.yaml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/values.yaml
@@ -449,15 +449,11 @@ config:
     # [google_spanner_envs] END
     # [google_secret_manager_envs] Envs related to using Google Secret Manager to store config and secret layer
     # -- Secret version to be used for secret configuration. Defaults to latest and should normally always stay that way. Used only when global.configAdapterName and global.configSecretAdapter is set to google.
-    cnSecretGoogleSecretVersionId: "latest"
+    cnGoogleSecretVersionId: "latest"
     # -- Prefix for Gluu secret in Google Secret Manager. Defaults to gluu. If left gluu-secret secret will be created. Used only when global.configAdapterName and global.configSecretAdapter is set to google.
-    cnSecretGoogleSecretNamePrefix: gluu
+    cnGoogleSecretNamePrefix: gluu
     # -- Passphrase for Gluu secret in Google Secret Manager. This is used for encrypting and decrypting data from the Google Secret Manager. Used only when global.configAdapterName and global.configSecretAdapter is set to google.
     cnGoogleSecretManagerPassPhrase: Test1234#
-    # -- Secret version to be used for configuration. Defaults to latest and should normally always stay that way. Used only when global.configAdapterName and global.configSecretAdapter is set to google. Used only when global.configAdapterName and global.configSecretAdapter is set to google.
-    cnConfigGoogleSecretVersionId: "latest"
-    # -- Prefix for Gluu configuration secret in Google Secret Manager. Defaults to gluu. If left intact gluu-configuration secret will be created. Used only when global.configAdapterName and global.configSecretAdapter is set to google.
-    cnConfigGoogleSecretNamePrefix: gluu
     # [google_secret_manager_envs] END
     # [google_envs] END
     # [aws_envs] Envs related to using AWS