Merge pull request #34 from mhjacks/odf_fix

Only output preparePlacement key when needed

Author: OAharoni-RedHat

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.3.2
+version: 0.3.3
 
 # 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

README.md

@@ -1,11 +1,15 @@
 # openshift-data-foundations
 
-![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 A Helm chart to install ODF on Openshift
 
 ### Notable changes
 
+* v0.3.3: Only emit `preparePlacement` when overridden. Otherwise the application may go out-of-sync on ArgoCD.
+
+* v0.3.2: Make `preparePlacement` configurable.
+
 * v0.3.1: Make `objectStorage.enable`: `false` cover more resources.
 
 * v0.3.0: Replace `global.datacenter.storageClassName` with `odf.osd.pvc.storageClassName`.

README.md.gotmpl

@@ -7,6 +7,10 @@
 
 ### Notable changes
 
+* v0.3.3: Only emit `preparePlacement` when overridden. Otherwise the application may go out-of-sync on ArgoCD.
+
+* v0.3.2: Make `preparePlacement` configurable.
+
 * v0.3.1: Make `objectStorage.enable`: `false` cover more resources.
 
 * v0.3.0: Replace `global.datacenter.storageClassName` with `odf.osd.pvc.storageClassName`.

templates/odf-storagecluster.yaml

@@ -45,8 +45,8 @@ spec:
         cpu: {{ .Values.odf.osd.requests.cpu | squote }}
         memory: {{ .Values.odf.osd.requests.memory }}
     placement: {}
-    preparePlacement:
 {{- if .Values.odf.preparePlacement }}
+    preparePlacement:
 {{ .Values.odf.preparePlacement | toYaml | indent 6 }}
 {{- end }}
     dataPVCTemplate: