Merge pull request #432 from element-hq/gaelg/fix-default-keys

MAS: remove default keys from method calls

Author: gaelgatelement

charts/matrix-stack/source/matrixAuthenticationService.yaml.j2

@@ -35,10 +35,10 @@ privateKeys:
 {{ sub_schema_values.labels() }}
 {{ sub_schema_values.serviceAccount() }}
 {{ sub_schema_values.nodeSelector() }}
-{{ sub_schema_values.tolerations(global=false, key='tolerations') }}
-{{ sub_schema_values.topologySpreadConstraints(global=true, key= 'topologySpreadConstraints') }}
+{{ sub_schema_values.tolerations() }}
+{{ sub_schema_values.topologySpreadConstraints() }}
 {{ sub_schema_values.podSecurityContext(user_id=10005, group_id=10005) }}
-{{ sub_schema_values.containersSecurityContext(key='containersSecurityContext') }}
+{{ sub_schema_values.containersSecurityContext() }}
 {{ sub_schema_values.workloadAnnotations() }}
-{{ sub_schema_values.serviceMonitors(key= 'serviceMonitors') }}
+{{ sub_schema_values.serviceMonitors() }}
 {{ sub_schema_values.extraEnv() }}

charts/matrix-stack/values.yaml

@@ -1234,10 +1234,10 @@ matrixAuthenticationService:
 
   tolerations: []
 
-  ## TopologySpreadConstraints describes how Pods for a component should be spread between nodes.
+  ## TopologySpreadConstraints describes how Pods for this component should be spread between nodes.
   ## https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/ for in-depth details
-  ## labelSelector can be omitted and the chart will populate a sensible value for each component.
-  ## Similarly `pod-template-hash` will be aded to `matchLabelKeys` if appropriate for each component.
+  ## labelSelector can be omitted and the chart will populate a sensible value for this component.
+  ## Similarly `pod-template-hash` will be aded to `matchLabelKeys` if appropriate for this component.
   ## If any TopologySpreadConstraints are provided for a component any global TopologySpreadConstraints are ignored for that component.
   ## e.g.
   ## topologySpreadConstraints:

newsfragments/432.internal.md

@@ -0,0 +1 @@
+MAS: Fix schema schema method calls do not need to respecify default keys values.