Prevent key sort on yaml_merge in fence

Bumping versions

Author: k-burt-uch

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.72
+version: 0.1.73
 
 # 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

helm/fence/README.md

@@ -1,6 +1,6 @@
 # fence
 
-![Version: 0.1.72](https://img.shields.io/badge/Version-0.1.71-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
+![Version: 0.1.73](https://img.shields.io/badge/Version-0.1.73-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
 
 A Helm chart for gen3 Fence
 

helm/fence/scripts/yaml_merge.py

@@ -35,7 +35,7 @@ def merge_dicts(dict1, dict2):
 
 def save_merged_file(merged_data, output_file_path):
     with open(output_file_path, 'w') as output_file:
-        yaml.dump(merged_data, output_file, default_flow_style=False)
+        yaml.dump(merged_data, output_file, default_flow_style=False, sort_keys=False)
 
 if __name__ == "__main__":
     # Check if at least two arguments are provided (including the script name)

helm/frontend-framework/README.md

@@ -8,7 +8,7 @@ A Helm chart for the gen3 frontend framework
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../common | common | 0.1.31 |
+| file://../common | common | 0.1.34 |
 
 ## Values
 

helm/gen3/Chart.yaml

@@ -64,7 +64,7 @@ dependencies:
     repository: "file://../frontend-framework"
     condition: frontend-framework.enabled
   - name: fence
-    version: 0.1.72
+    version: 0.1.73
     repository: "file://../fence"
     condition: fence.enabled
   - name: funnel
@@ -193,7 +193,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 0.3.20
+version: 0.3.21
 
 # 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

helm/gen3/README.md

@@ -1,6 +1,6 @@
 # gen3
 
-![Version: 0.3.20](https://img.shields.io/badge/Version-0.3.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
+![Version: 0.3.21](https://img.shields.io/badge/Version-0.3.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
 
 Helm chart to deploy Gen3 Data Commons
 
@@ -33,8 +33,8 @@ Helm chart to deploy Gen3 Data Commons
 | file://../dicom-server | dicom-server | 0.1.27 |
 | file://../embedding-management-service | embedding-management-service | 0.1.4 |
 | file://../etl | etl | 0.1.22 |
-| file://../fence | fence | 0.1.72 |
-| file://../frontend-framework | frontend-framework | 0.1.22 |
+| file://../fence | fence | 0.1.73 |
+| file://../frontend-framework | frontend-framework | 0.1.23 |
 | file://../funnel | funnel | 0.1.13 |
 | file://../gen3-analysis | gen3-analysis | 0.1.9 |
 | file://../gen3-network-policies | gen3-network-policies | 0.1.3 |