Fixes for ArgoCD

0hlov3 · Jan 10, 2025 · 534628b · 534628b
1 parent 0010e36
commit 534628b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 1 deletion.
diff --git a/charts/matrix-synapse/Chart.yaml b/charts/matrix-synapse/Chart.yaml
@@ -6,7 +6,7 @@ home: https://github.com/element-hq/synapse
 type: application
 
 # Chart version should follow semantic versioning: https://semver.org/
-version: 1.0.2
+version: 1.0.3
 
 # Application version reflects the specific release of the application.
 # Use quotes to preserve formatting.

diff --git a/charts/matrix-synapse/templates/signingkeyjob/configmap.yaml b/charts/matrix-synapse/templates/signingkeyjob/configmap.yaml
@@ -6,6 +6,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ $name }}-scripts
+  annotations:
+    argocd.argoproj.io/sync-wave: "-5"
   labels:
     {{- include "matrix-synapse.signingKeylabels" . | nindent 4 }}
 data:

diff --git a/charts/matrix-synapse/templates/signingkeyjob/job.yaml b/charts/matrix-synapse/templates/signingkeyjob/job.yaml
@@ -6,6 +6,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ $name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "-5"
   labels:
     {{- include "matrix-synapse.signingKeylabels" . | nindent 4 }}
 spec:

diff --git a/charts/matrix-synapse/templates/signingkeyjob/role.yaml b/charts/matrix-synapse/templates/signingkeyjob/role.yaml
@@ -6,6 +6,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ $name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "-5"
   labels:
     {{- include "matrix-synapse.signingKeylabels" . | nindent 4 }}
 rules:

diff --git a/charts/matrix-synapse/templates/signingkeyjob/rolebinding.yaml b/charts/matrix-synapse/templates/signingkeyjob/rolebinding.yaml
@@ -6,6 +6,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ $name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "-5"
   labels:
     {{- include "matrix-synapse.signingKeylabels" . | nindent 4 }}
 roleRef:

diff --git a/charts/matrix-synapse/templates/signingkeyjob/secret-signingkey.yaml b/charts/matrix-synapse/templates/signingkeyjob/secret-signingkey.yaml
@@ -7,6 +7,9 @@ kind: Secret
 metadata:
   annotations:
     helm.sh/resource-policy: keep
+    argocd.argoproj.io/sync-wave: "-5"
+    argocd.argoproj.io/sync-options: Delete=false
+    argocd.argoproj.io/ignore-resource-updates: "true"
   name: {{ $name }}
   labels:
     {{- include "matrix-synapse.signingKeylabels" . | nindent 4 }}

diff --git a/charts/matrix-synapse/templates/signingkeyjob/serviceaccount.yaml b/charts/matrix-synapse/templates/signingkeyjob/serviceaccount.yaml
@@ -6,6 +6,8 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ $name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "-5"
   labels:
     {{- include "matrix-synapse.signingKeylabels" . | nindent 4 }}
 {{- end }}