2.12.18

helm/operator/Chart.yaml

@@ -20,9 +20,9 @@ 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: 2.12.17
+version: 2.12.18
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 2.12.17
+appVersion: 2.12.18

helm/operator/values.yaml

@@ -31,7 +31,7 @@ operator:
     imagePullPolicy: Always
     image:
       repository: docker.io/vectorim/ess-starter-edition-core-operator
-      tag: 2.12.17
+      tag: 2.12.18
 
   rbacProxy:
     resources:

helm/updater/Chart.yaml

@@ -20,9 +20,9 @@ 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: 2.12.17
+version: 2.12.18
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 2.12.17
+appVersion: 2.12.18

helm/updater/values.yaml

@@ -31,7 +31,7 @@ updater:
         - ALL
     image:
       repository: docker.io/vectorim/ess-starter-edition-core-updater
-      tag: 2.12.17
+      tag: 2.12.18
 
   rbacProxy:
     resources:

roles/generic_apply/filter_plugins/sort_apply_order.py

@@ -0,0 +1,34 @@
+# Copyright 2023 New Vector Ltd
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+
+# Anything not listed below gets sorted after Kinds that have been listed, maintaining the input order
+resources_order = [
+  "Secret",
+  "ConfigMap",
+  "PersistentVolumeClaim",
+  "Pod",
+  "Deployment",
+  "StatefulSet",
+  "Ingress",
+  "Service",
+  # We deploy Synapse here because
+  # we want to deploy it before every other resources
+  "Synapse"
+]
+
+class FilterModule(object):
+  def filters(self): return {'sort_apply_order': sort_apply_order}
+
+def _res_order(o):
+  try:
+    return resources_order.index(o['kind'])
+  except ValueError:
+    return len(resources_order)
+
+def sort_apply_order(data):
+  if isinstance(data, list):
+    data.sort(key=_res_order)
+  return data
+

roles/generic_apply/tasks/main.yml

@@ -33,6 +33,7 @@
         | map('drop_null_values')
         | select
         | map('combine', _generic_apply_mixin, recursive=true)
+        | sort_apply_order
       }}
 
 - name: Apply Manifest in check_mode