Skip to content

Commit

Permalink
Remove CIOps and use standard language to clarify reconciliation.
Browse files Browse the repository at this point in the history
Signed-off-by: Dan Garfield <[email protected]>
  • Loading branch information
todaywasawesome committed Sep 29, 2021
1 parent 10b34aa commit 0a65a70
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions GLOSSARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ This glossary accompanies the [GitOps Principles](./PRINCIPLES.md), and other su
- ## Reconciliation

The process of ensuring the actual state of a system matches its [desired state](#desired-state) declarations.
Contrary to "CIops", any divergence between the two will trigger reconciliation, regardless of where changes occurred.
Divergence could be due to the actual state unintentionally [drifting](#drift) from the desired state declarations, or a new desired state declaration version having been changed intentionally.
Contrary to traditional CI/CD where automation is generally driven by pre-set triggers, in GitOps reconciliation is triggered whenever there is a divergence. Divergence could be due to the actual state unintentionally [drifting](#drift) from the desired state declarations, or a new desired state declaration version having been changed intentionally.

- ## Software System

Expand Down

0 comments on commit 0a65a70

Please sign in to comment.