version bump

uc-cdis · May 7, 2024 · 477df0a · 477df0a
1 parent efe5e95
commit 477df0a
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 28 deletions.
diff --git a/helm/fence/Chart.yaml b/helm/fence/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.18
+version: 0.1.19
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/helm/fence/scripts/yaml_merge.py b/helm/fence/scripts/yaml_merge.py
@@ -24,11 +24,12 @@ def merge_yaml_files(file_paths):
     return merged_data
 
 def merge_dicts(dict1, dict2):
-    for key, value in dict2.items():
-        if key in dict1 and isinstance(dict1[key], dict) and isinstance(value, dict):
-            dict1[key] = merge_dicts(dict1[key], value)
-        else:
-            dict1[key] = value
+    if dict2 is not None: #Fix AttributeError
+        for key, value in dict2.items():
+            if key in dict1 and isinstance(dict1[key], dict) and isinstance(value, dict):
+                dict1[key] = merge_dicts(dict1[key], value)
+            else:
+                dict1[key] = value
 
     return dict1
 

diff --git a/helm/fence/templates/fence-deployment.yaml b/helm/fence/templates/fence-deployment.yaml
@@ -61,7 +61,7 @@ spec:
           args:
             - "-c"
             - |
-              python /var/www/fence/yaml_merge.py /var/tmp/fence-config-public.yaml /var/www/fence/fence-config-secret.yaml /var/www/fence/fence-config.yaml
+              python /var/www/fence/yaml_merge.py /var/tmp/fence-public-config.yaml /var/www/fence/fence-config-secret.yaml /var/www/fence/fence-config.yaml
               if [[ -f /fence/keys/key/jwt_private_key.pem ]]; then
                 openssl rsa -in /fence/keys/key/jwt_private_key.pem -pubout > /fence/keys/key/jwt_public_key.pem
               fi

diff --git a/helm/fence/templates/fence-public-config.yaml b/helm/fence/templates/fence-public-config.yaml
@@ -2,10 +2,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: fence-public-config
-stringData:
+data:
   fence-public-config.yaml: |
-{{- if hasKey .Values "FENCE_PUBLIC_CONFIG" }}
     {{- with .Values.FENCE_PUBLIC_CONFIG }}
     {{- toYaml . | nindent 4 }}
     {{ end }}
-{{- end }}
+
diff --git a/helm/fence/templates/presigned-url-fence.yaml b/helm/fence/templates/presigned-url-fence.yaml
@@ -54,8 +54,7 @@ spec:
           args:
             - "-c"
             - |
-              echo "${FENCE_PUBLIC_CONFIG:-""}" > "/var/www/fence/fence-config-public.yaml"
-              python /var/www/fence/yaml_merge.py /var/www/fence/fence-config-public.yaml /var/www/fence/fence-config-secret.yaml > /var/www/fence/fence-config.yaml
+              python /var/www/fence/yaml_merge.py /var/tmp/fence-public-config.yaml /var/www/fence/fence-config-secret.yaml /var/www/fence/fence-config.yaml
               if [[ -f /fence/keys/key/jwt_private_key.pem ]]; then
                 openssl rsa -in /fence/keys/key/jwt_private_key.pem -pubout > /fence/keys/key/jwt_public_key.pem
               fi

diff --git a/helm/fence/values.yaml b/helm/fence/values.yaml
@@ -291,12 +291,12 @@ env:
     value: /var/www/fence
   - name: GEN3_DEBUG
     value: "False"
-  - name: FENCE_PUBLIC_CONFIG
-    valueFrom:
-      configMapKeyRef:
-        name: manifest-fence
-        key: fence-config-public.yaml
-        optional: true
+  # - name: FENCE_PUBLIC_CONFIG
+  #   valueFrom:
+  #     configMapKeyRef:
+  #       name: manifest-fence
+  #       key: fence-config-public.yaml
+  #       optional: true
   - name: PGHOST
     valueFrom:
       secretKeyRef:
@@ -409,11 +409,11 @@ volumeMounts:
     subPath: "privacy_policy.md"
   - name: "config-volume"
     readOnly: true
-    mountPath: "/var/tmp/fence/fence-config-secret.yaml"
+    mountPath: "/var/www/fence/fence-config-secret.yaml"
     subPath: fence-config-secret.yaml
   - name: "public-config-volume"
     readOnly: true
-    mountPath: "/var/www/fence/fence-public-config.yaml"
+    mountPath: "/var/tmp/fence-public-config.yaml"
     subPath: fence-public-config.yaml
   - name: "fence-scripts"
     readOnly: true
@@ -436,7 +436,7 @@ volumeMounts:
 initVolumeMounts:
   - name: "config-volume"
     readOnly: true
-    mountPath: "/var/tmp/fence-config-secret.yaml"
+    mountPath: "/var/www/fence/fence-config-secret.yaml"
     subPath: fence-config-secret.yaml
   - name: "fence-scripts"
     readOnly: true
@@ -1393,7 +1393,6 @@ USER_YAML: |
       - auth_id: jnkns
         privilege: [create, read, update, delete, upload, read-storage]
 
-
 # -- (map) Configuration settings for Fence app
 FENCE_CONFIG:
   # -- (string) Name of the Fence app
@@ -2284,3 +2283,6 @@ FENCE_CONFIG:
     visa_types:
       ras: ["https://ras.nih.gov/visas/v1", "https://ras.nih.gov/visas/v1.1"]
   RAS_USERINFO_ENDPOINT: '/openid/connect/v1.1/userinfo'
+# -- (map) Public Configuration settings for Fence app
+# NOTE: Remove the {} and supply additional configuration if needed.
+FENCE_PUBLIC_CONFIG: {}
diff --git a/helm/gen3/Chart.yaml b/helm/gen3/Chart.yaml
@@ -36,11 +36,11 @@ dependencies:
   repository: "file://../frontend-framework"
   condition: frontend-framework.enabled
 - name: fence
-  version: 0.1.18
+  version: 0.1.19
   repository: "file://../fence"
   condition: fence.enabled
 - name: guppy
-  version: 0.1.11
+  version: 0.1.12
   repository: "file://../guppy"
   condition: guppy.enabled
 - name: hatchery

diff --git a/helm/guppy/Chart.yaml b/helm/guppy/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.11
+version: 0.1.12
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/helm/guppy/templates/guppy_config.yaml b/helm/guppy/templates/guppy_config.yaml
@@ -6,9 +6,7 @@ data:
   guppy_config.json: |
       {
         "indices": {{ .Values.indices  | toJson }},
-        {{- with .Values.configIndex }}
-        "config_index": {{ . | quote }},
-        {{- end }}
+        "config_index": {{ .Values.configIndex | toJson }},
         "auth_filter_field": {{ .Values.authFilterField | quote }},
         "enable_encrypt_whitelist": {{ .Values.enableEncryptWhitelist | quote }},
         "encrypt_whitelist":  {{ .Values.encryptWhitelist | quote }}