Introduction

This repo contains examples of different diff'ing scenarios with kubectl diff and Argo CD Diff strategies

Use Cases

1. Manual Edits
2. Changes in git
3. Mutations

Notes

Can enable server-side-diff in Argo CD through annotation or by adding:

spec:
  controller:
    extraCommandArgs:
      - '--server-side-diff-enabled'

References

• How Apply calculates differences and merges changes
• Interesting comments in Kubernetes issues:
  • kubectl diff not producing any changes when fields are removed from manifest
  • kubectl diff unable to detect changes made by kubectl edit
  • Server-side apply: migration from client-side apply leaves stuck fields in the object

OpenShift GitOps

These use cases where run using OpenShift GitOps 1.18 (Argo CD 3.1)

It uses the default setup of cluster-admins group, to create this group run the following:

oc adm groups new cluster-admins admin

You also need to give the application-controller SA cluster-admin rights:

oc adm policy add-cluster-role-to-user cluster-admin -z openshift-gitops-argocd-application-controller -n openshift-gitops