operators-installer - fix argo sync waves so that operator is install…

…ed before sync wave 0 where it is likley (due to it being default) that that is where CRs using the CRDs installed by these operators will be
redhat-cop · Jul 19, 2023 · 60f5bbe · 60f5bbe
1 parent ae0ec34
commit 60f5bbe
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 6 deletions.
diff --git a/charts/operators-installer/Chart.yaml b/charts/operators-installer/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: 2.3.1
+version: 2.3.2
 
 home: https://github.com/redhat-cop/helm-charts
 

diff --git a/charts/operators-installer/templates/Job_installplan-approver.yaml b/charts/operators-installer/templates/Job_installplan-approver.yaml
@@ -15,7 +15,7 @@ metadata:
  "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
  "helm.sh/hook-weight": "20"
  {{- else }}
- argocd.argoproj.io/sync-wave: "20"
+ argocd.argoproj.io/sync-wave: "-20"
  {{- end }}
 spec:
  completions: 1

diff --git a/charts/operators-installer/templates/Job_installplan-complete-verifier.yaml b/charts/operators-installer/templates/Job_installplan-complete-verifier.yaml
@@ -15,7 +15,7 @@ metadata:
  "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
  "helm.sh/hook-weight": "30"
  {{- else }}
- argocd.argoproj.io/sync-wave: "30"
+ argocd.argoproj.io/sync-wave: "-10"
  {{- end }}
 spec:
  completions: 1

diff --git a/charts/operators-installer/templates/Namespace.yaml b/charts/operators-installer/templates/Namespace.yaml
@@ -7,5 +7,7 @@ metadata:
  name: {{ .name | default $.Release.Namespace }}
  labels:
  {{- include "operators-installer.labels" $ | nindent 4 }}
+ annotations:
+ argocd.argoproj.io/sync-wave: "-60"
 {{- end }}
 {{- end }}
diff --git a/charts/operators-installer/templates/OperatorGroup.yaml b/charts/operators-installer/templates/OperatorGroup.yaml
@@ -8,6 +8,8 @@ metadata:
  namespace: {{ .name | default $.Release.Namespace }}
  labels:
  {{- include "operators-installer.labels" $ | nindent 4 }}
+ annotations:
+ argocd.argoproj.io/sync-wave: "-50"
 spec:
  targetNamespaces:
  {{- if .targetOwnNamespace }}

diff --git a/charts/operators-installer/templates/RoleBinding_installplan-approvers.yaml b/charts/operators-installer/templates/RoleBinding_installplan-approvers.yaml
@@ -14,7 +14,7 @@ metadata:
  "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
  "helm.sh/hook-weight": "10"
  {{- else }}
- argocd.argoproj.io/sync-wave: "10"
+ argocd.argoproj.io/sync-wave: "-30"
  {{- end }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io

diff --git a/charts/operators-installer/templates/Role_installplan-approver.yaml b/charts/operators-installer/templates/Role_installplan-approver.yaml
@@ -14,7 +14,7 @@ metadata:
  "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
  "helm.sh/hook-weight": "10"
  {{- else }}
- argocd.argoproj.io/sync-wave: "10"
+ argocd.argoproj.io/sync-wave: "-30"
  {{- end }}
 rules:
 - apiGroups:

diff --git a/charts/operators-installer/templates/ServiceAccount_installplan-approver.yaml b/charts/operators-installer/templates/ServiceAccount_installplan-approver.yaml
@@ -14,6 +14,6 @@ metadata:
  "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
  "helm.sh/hook-weight": "10"
  {{- else }}
- argocd.argoproj.io/sync-wave: "10"
+ argocd.argoproj.io/sync-wave: "-30"
  {{- end }}
 {{- end }}
diff --git a/charts/operators-installer/templates/Subscription.yaml b/charts/operators-installer/templates/Subscription.yaml
@@ -8,6 +8,8 @@ metadata:
  namespace: {{ .namespace | default $.Release.Namespace }}
  labels:
  {{- include "operators-installer.labels" $ | nindent 4 }}
+ annotations:
+ argocd.argoproj.io/sync-wave: "-40"
 spec:
  channel: {{ .channel }}
  installPlanApproval: {{ .installPlanApproval }}