Skip to content

Commit 762f8b5

Browse files
committed
Remove application level sync-waves
After testings, it seems we don't need to set sync-waves at the application level. This allows to be closer to Validated Patterns "eventually converging" practices. Depends-On: validatedpatterns-sandbox/rhoso-gitops#17
1 parent 5780b20 commit 762f8b5

3 files changed

Lines changed: 28 additions & 34 deletions

File tree

‎content/patterns/rhoso-gitops/troubleshooting.adoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ Inspect a child application that is out of sync or unhealthy:
4242
$ oc describe application <application-name> -n rhoso-gitops-standalone
4343
----
4444

45-
Use the Argo CD UI in the `rhoso-gitops-standalone` namespace to review sync waves,
46-
resource health, and diff details for upstream overlays.
45+
Use the Argo CD UI in the `rhoso-gitops-standalone` namespace to review
46+
application status, resource health, and diff details for upstream overlays.
4747

4848
[id="rhoso-gitops-check-pods"]
4949
== Checking pod status
@@ -75,8 +75,8 @@ $ oc logs -n <namespace> <pod-name>
7575
`overrides/values-rhoso-gitops.yaml` match a tag or branch that exists in
7676
link:https://github.com/openstack-k8s-operators/gitops[openstack-k8s-operators/gitops].
7777
* *Operator install delays* — Infrastructure operators in `operator-dependencies`
78-
subscribe from the cluster catalog; allow time for OLM to resolve CSVs before
79-
later sync waves run.
78+
subscribe from the cluster catalog; allow time for OLM to resolve CSVs.
79+
Other applications retry automatically until their dependencies are satisfied.
8080

8181
For community support, open an issue in the
8282
link:https://github.com/validatedpatterns-sandbox/rhoso-gitops/issues[pattern repository].

‎modules/rhoso-gitops/rhoso-gitops-architecture.adoc‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ The delivery path is:
2121
. Child apps sync upstream `example/*` overlays in order (operators, networks,
2222
control plane, dataplane)
2323

24-
.GitOps application delivery and sync-wave ordering
24+
.GitOps application delivery
2525
image::rhoso-gitops/rhoso-gitops-applications.svg[{rhoso-gitops-pattern} GitOps application delivery,700]
2626

2727
The diagram shows the parent Application in `vp-gitops`, child Applications in
2828
`rhoso-gitops-standalone`, and the upstream Kustomize overlays they sync.
29-
Sync-wave annotations order deployment from infrastructure operators through
30-
the data plane.
29+
All child applications deploy at sync-wave 0 and converge eventually through
30+
retry policies.
3131

3232
[id="rhoso-gitops-dual-argocd"]
3333
== Dual Argo CD namespaces
@@ -56,44 +56,38 @@ image::rhoso-gitops/rhoso-gitops-infrastructure.svg[{rhoso-gitops-pattern} infra
5656
* *Data plane hosts* — one or more {rhel-short} compute nodes run {rh-rhoso-short}
5757
dataplane elements, connected to the control plane
5858

59-
[id="rhoso-gitops-sync-waves"]
60-
== Application sync order
59+
[id="rhoso-gitops-deployment-convergence"]
60+
== Deployment convergence
6161

62-
Child Applications deploy in sync-wave order when Argo CD reconciles the parent
63-
*rhoso-gitops* Application. All applications use automated sync with a retry
64-
policy by default.
62+
All child Applications deploy at sync-wave `0` (the default) when Argo CD
63+
reconciles the parent *rhoso-gitops* Application. Argo CD launches every child
64+
simultaneously; each retries (per `syncPolicy.retry`) until its upstream
65+
dependencies are satisfied and converges eventually.
6566

66-
[cols="2,3,1",options="header"]
67+
[cols="2,3",options="header"]
6768
|===
68-
| Application | Purpose | Sync wave
69+
| Application | Purpose
6970

7071
| `operator-dependencies`
7172
| Infrastructure operators (cert-manager, MetalLB, nmstate, observability)
72-
| `-20`
7373

7474
| `openstack-operator`
7575
| OpenStack operator subscription
76-
| `-20`
7776

7877
| `openstack-operator-cr`
7978
| Main `OpenStack` custom resource
80-
| `-15`
8179

8280
| `openstack-secrets`
8381
| Secure-backend sync (disabled by default)
84-
| `-10`
8582

8683
| `openstack-networks`
8784
| Network configuration
88-
| `0`
8985

9086
| `openstack-controlplane`
9187
| `OpenStackControlPlane`
92-
| `10`
9388

9489
| `openstack-dataplane`
9590
| Data plane
96-
| `20`
9791
|===
9892

9993
After changing overrides, confirm child apps in the Argo CD UI or with

0 commit comments

Comments
 (0)