fix: add aws envs and unquote aws config

GluuFederation · Mar 6, 2023 · 7e40c38 · 7e40c38
1 parent 3a409ea
commit 7e40c38
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml
@@ -39,6 +39,15 @@ data:
   GLUU_CONFIG_GOOGLE_SECRET_VERSION_ID: {{ .Values.configmap.cnConfigGoogleSecretVersionId | quote }}
   GLUU_CONFIG_GOOGLE_SECRET_NAME_PREFIX: {{ .Values.configmap.cnConfigGoogleSecretNamePrefix | quote }}
   # [google_secret_manager_envs] END
+  # [aws_envs] Envs related to using AWS
+  GLUU_AWS_SECRETS_ENDPOINT_URL: {{ .Values.configmap.cnAwsSecretsEndpointUrl }}
+  GLUU_AWS_SECRETS_PREFIX: {{ .Values.configmap.cnAwsSecretsNamePrefix }}
+  GLUU_AWS_SECRETS_REPLICA_FILE: {{ .Values.global.cnAwsSecretsReplicaRegionsFile }}
+  AWS_DEFAULT_REGION: {{ .Values.configmap.cnAwsDefaultRegion }}
+  AWS_SHARED_CREDENTIALS_FILE: {{ .Values.global.cnAwsSharedCredentialsFile }}
+  AWS_CONFIG_FILE: {{ .Values.global.cnAwsConfigFile }}
+  #AWS_PROFILE
+  # [aws_envs] END
   GLUU_CONFIG_KUBERNETES_NAMESPACE: {{ .Release.Namespace | quote }}
   GLUU_SECRET_KUBERNETES_NAMESPACE: {{ .Release.Namespace | quote }}
   GLUU_CONTAINER_METADATA: {{ .Values.configmap.containerMetadataName | quote }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/secrets.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/secrets.yaml
@@ -126,12 +126,12 @@ metadata:
 type: Opaque
 stringData:
   aws_shared_credential_file: |-
-    [{{ .Values.configmap.cnAwsProfile | quote }}]
+    [{{ .Values.configmap.cnAwsProfile }}]
     aws_access_key_id = {{ .Values.configmap.cnAwsAccessKeyId }}
     aws_secret_access_key = {{ .Values.configmap.cnAwsSecretAccessKey }}
   aws_config_file: |-
-    [{{ .Values.configmap.cnAwsProfile | quote }}]
-    region = {{ .Values.configmap.cnAwsDefaultRegion | quote }}
+    [{{ .Values.configmap.cnAwsProfile }}]
+    region = {{ .Values.configmap.cnAwsDefaultRegion }}
   aws_secrets_replica_regions: |-
     {{ .Values.configmap.cnAwsSecretsReplicaRegions | toJson }}
 {{- end }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/values.yaml b/pygluu/kubernetes/templates/helm/gluu/values.yaml
@@ -507,7 +507,7 @@ config:
     # The default AWS Region to use, for example, `us-west-1` or `us-west-2`.
     cnAwsDefaultRegion: us-west-1
     # The default profile to use.
-    cnAwsProfile: "gluu"
+    cnAwsProfile: gluu
     # Example replicated region [{"Region": "us-west-1"}, {"Region": "us-west-2"}]
     cnAwsSecretsReplicaRegions: []
     # [aws_secret_manager_envs] END