openstack/openstack-helm
Code Issues Proposed changes

ceph-osd: Make hash calculcation deterministic

Browse Source 
Go returns the keys of a map in arbitrary order, so the name of DaemonSets
which includes a hash over all matchExpressions could change when upgrading
releases eventhough the node or label selector hasn't changed.

Change-Id: I882c7b51d52ba4ace99b8a8830725ae38a1c3b94
Co-authored-by: Lars Fenneberg <lf@elemental.net>
Signed-off-by: Pete Birley <pete@port.direct>
Story: 2002774
This commit is contained in:
Pete Birley 2018-07-19 10:10:55 -05:00
parent d003a082c8
commit 12d47b8968
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
View File

@ -14,6 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- define "ceph.utils.match_exprs_hash" }}
{{- $match_exprs := index . 0 }}
{{- $context := index . 1 }}
{{- $_ := set $context.Values "__match_exprs_hash_content" "" }}
{{- range $match_expr := $match_exprs }}
{{- $_ := set $context.Values "__match_exprs_hash_content" (print $context.Values.__match_exprs_hash_content $match_expr.key $match_expr.operator ($match_expr.values | quote)) }}
{{- end }}
{{- $context.Values.__match_exprs_hash_content | sha256sum | trunc 8 }}
{{- $_ := unset $context.Values "__match_exprs_hash_content" }}
{{- end }}
{{- define "ceph.utils.osd_daemonset_overrides" }}
{{- $daemonset := index . 0 }}
{{- $daemonset_yaml := index . 1 }}
@ -207,7 +218,7 @@ limitations under the License.
name uniqueness */}}
{{- $_ := set $current_dict "dns_1123_name" dict }}
{{- if hasKey $current_dict "matchExpressions" }}
{{- $_ := set $current_dict "dns_1123_name" (printf (print $name_format2 "-" ($current_dict.matchExpressions | quote | sha256sum | trunc 8))) }}
{{- $_ := set $current_dict "dns_1123_name" (printf (print $name_format2 "-" (list $current_dict.matchExpressions $context | include "ceph.utils.match_exprs_hash"))) }}
{{- else }}
{{- $_ := set $current_dict "dns_1123_name" $name_format2 }}
{{- end }}